Merge pull request #418 from JrGoodle/more-test-cleanup

More test cleanup
JrGoodle · Apr 18, 2020 · 314145d · 314145d
2 parents 6b93269 + 058430c
commit 314145d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 292 deletions.
diff --git a/clowder_test/clowder_test/cli/llvm_controller.py b/clowder_test/clowder_test/cli/llvm_controller.py
@@ -35,14 +35,6 @@ def all(self):
 
         self._execute_command('./test_example_llvm.sh', os.path.join(ROOT_DIR, 'test', 'scripts'))
 
-    @expose(
-        help='Run llvm branch tests'
-    )
-    def branch(self):
-        """clowder llvm branch tests"""
-
-        self._execute_command('./branch.sh', self.path)
-
     @expose(
         help='Run llvm forks tests'
     )
@@ -51,22 +43,6 @@ def forks(self):
 
         self._execute_command('./forks.sh', self.path)
 
-    @expose(
-        help='Run llvm herd tests'
-    )
-    def herd(self):
-        """clowder llvm herd tests"""
-
-        self._execute_command('./herd.sh', self.path)
-
-    @expose(
-        help='Run llvm reset tests'
-    )
-    def reset(self):
-        """clowder llvm reset tests"""
-
-        self._execute_command('./reset.sh', self.path)
-
     @expose(
         help='Run llvm sync tests'
     )

diff --git a/test/scripts/cats/help.sh b/test/scripts/cats/help.sh
@@ -13,19 +13,54 @@ print_double_separator
 cd "$CATS_EXAMPLE_DIR" || exit 1
 ./init.sh
 
+export commands=( 'branch' \
+                  'clean' \
+                  'diff' \
+                  'forall' \
+                  'herd' \
+                  'init' \
+                  'link' \
+                  'prune' \
+                  'repo' \
+                  'repo add' \
+                #   'repo checkout' \
+                #   'repo clean' \
+                  'repo commit' \
+                  'repo pull' \
+                  'repo push' \
+                  'repo run' \
+                #   'repo status' \
+                  'save' \
+                  'start' \
+                  'stash' \
+                  'status' \
+                  'sync' \
+                  'yaml' )
+
+_test_help() {
+    print_single_separator
+    echo "TEST: clowder -h"
+    $COMMAND -h || exit 1
+
+    for cmd in "${commands[@]}"; do
+        print_single_separator
+        echo "TEST: clowder $cmd -h"
+        $COMMAND $cmd -h || exit 1
+    done
+}
+
 test_help() {
     print_double_separator
     ./clean.sh
     ./init.sh || exit 1
+
     echo "TEST: Print help with invalid clowder.yaml"
     $COMMAND link -v 'test-missing-default-ref' || exit 1
-    "$TEST_SCRIPT_DIR/test_help.sh" "$CATS_EXAMPLE_DIR" || exit 1
+    _test_help
 
     print_double_separator
     echo "TEST: Print help with valid clowder.yaml"
     $COMMAND link || exit 1
-    $COMMAND herd $PARALLEL || exit 1
-    $COMMAND status || exit 1
-    "$TEST_SCRIPT_DIR/test_help.sh" "$CATS_EXAMPLE_DIR" || exit 1
+    _test_help
 }
 test_help
diff --git a/test/scripts/llvm/branch.sh b/test/scripts/llvm/branch.sh
diff --git a/test/scripts/llvm/herd.sh b/test/scripts/llvm/herd.sh
diff --git a/test/scripts/llvm/reset.sh b/test/scripts/llvm/reset.sh
diff --git a/test/scripts/swift/help.sh b/test/scripts/swift/help.sh
diff --git a/test/scripts/test_example_llvm.sh b/test/scripts/test_example_llvm.sh
@@ -10,8 +10,5 @@ print_double_separator
 echo 'TEST: llvm projects example test script'
 print_double_separator
 
-"$TEST_SCRIPT_DIR/llvm/herd.sh" || exit 1
 "$TEST_SCRIPT_DIR/llvm/forks.sh" || exit 1
 "$TEST_SCRIPT_DIR/llvm/sync.sh" || exit 1
-"$TEST_SCRIPT_DIR/llvm/branch.sh" || exit 1
-"$TEST_SCRIPT_DIR/llvm/reset.sh" || exit 1
diff --git a/test/scripts/test_example_swift.sh b/test/scripts/test_example_swift.sh
@@ -13,4 +13,3 @@ print_double_separator
 "$TEST_SCRIPT_DIR/swift/configure_remotes.sh" || exit 1
 "$TEST_SCRIPT_DIR/swift/config_versions.sh" || exit 1
 "$TEST_SCRIPT_DIR/swift/reset.sh" || exit 1
-"$TEST_SCRIPT_DIR/swift/help.sh" || exit 1
diff --git a/test/scripts/test_help.sh b/test/scripts/test_help.sh