From fd6e7adca086e86657efdcd0a10cb1d2b3c8ad1e Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@gmail.com>
Date: Wed, 24 Sep 2014 16:55:06 +0000
Subject: Remove unused cmdtests

tests.deploy is gone since we have yarn coverage instead.

tests/setup had unnecessary setup in it, since the remaining tests
require custom setup anyway.

A bunch of tests were disabled anyway, so they're gone.

Also, there was still code in ./check to run tests.merging, which have
been gone for a while.
---
 check | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'check')

diff --git a/check b/check
index 82774119..a942ca90 100755
--- a/check
+++ b/check
@@ -153,20 +153,6 @@ else
     echo "NOT RUNNING test.branching"
 fi
 
-if false && "$run_cmdtests"
-then
-    cmdtest tests.merging
-else
-    echo "NOT RUNNING test.merging"
-fi
-
-if "$run_cmdtests"
-then
-    cmdtest tests.deploy
-else
-    echo "NOT RUNNING test.deploy"
-fi
-
 # Building systems requires the 'filter' parameter of tarfile.TarFile.add():
 # this was introduced in Python 2.7
 if ! "$run_cmdtests"; then
-- 
cgit v1.2.1


From 01ae89708994a7b3baa59683d2e264b5c6e3bd42 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@gmail.com>
Date: Wed, 24 Sep 2014 21:30:55 +0000
Subject: Remove remaining test.as-root cmdtests

The repo-alias is indirectly tested by branch-from-image, and checking
the --version is part of the release process, so we're not going to miss
these tests.
---
 check | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'check')

diff --git a/check b/check
index a942ca90..dc4f96bc 100755
--- a/check
+++ b/check
@@ -162,19 +162,3 @@ elif ! (python --version 2>&1 | grep -q '^Python 2\.[78]'); then
 else
     cmdtest tests.build
 fi
-
-# The as-root tests use YAML morphologies, so they require the PyYAML module.
-if ! "$run_slow_cmdtests"; then
-    echo "NOT RUNNING tests.as-root"
-elif [ $(whoami) != root ] || ! command -v mkfs.btrfs > /dev/null; then
-    echo "NOT RUNNING tests.as-root (no btrfs)"
-elif ! python -c "
-import morphlib, sys
-if not morphlib.got_yaml:
-    sys.exit(1)
-" > /dev/null 2>&1
-then
-    echo "NOT RUNNING tests.as-root (requires PyYAML)"
-else
-    cmdtest tests.as-root
-fi
-- 
cgit v1.2.1