Merge pull request #9773 from izapolsk/collectonly-when-dummy

[1LP][RFR] dummy-appliance=>collect-only
ManageIQ · Dec 17, 2019 · 62aa75d · 62aa75d
2 parents 98f2bb7 + d164c5b
commit 62aa75d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cfme/test_framework/appliance.py b/cfme/test_framework/appliance.py
@@ -53,6 +53,9 @@ def pytest_configure(config):
         appliances = [
             DummyAppliance.from_config(config) for _ in range(config.getoption('--num-dummies'))
         ]
+        if not config.option.collectonly:
+            config.option.collectonly = True
+
         reporter.write_line('Retrieved Dummy Appliance', red=True)
     elif stack.top:
         appliances = [stack.top]

diff --git a/cfme/utils/dockerbot/pytestbase/setup.sh b/cfme/utils/dockerbot/pytestbase/setup.sh
@@ -260,15 +260,15 @@ set +e
 if [ "$USE_SPROUT" = "yes" ];
 then
     log "invoking complete collectonly with dummy instance before test"
-    gate "collectonly.txt" "py.test --collectonly --dummy-appliance --dummy-appliance-version $SPROUT_GROUP --use-provider complete"
+    gate "collectonly.txt" "py.test --collect-only --dummy-appliance --dummy-appliance-version $SPROUT_GROUP --use-provider complete"
 
     run_n_log "miq sprout checkout --populate-yaml --user-key sprout" &
     sleep 5
     do_or_die "python3 /check_provisioned.py >> $ARTIFACTOR_DIR/setup.txt" 5 60 "Sprout failed to provision appliance"
 else
     log "no sprout used"
     log "invoking complete collectonly with given appliance instance before test"
-    gate "collectonly.txt" "py.test --collectonly --use-provider complete"
+    gate "collectonly.txt" "py.test --collect-only --use-provider complete"
 fi
 
 if [ "$GATE_RHEV" = "yes" ]