Revert "[tests] Speedup script_tests"

This reverts commit 39989ca2fed731c38f321d18fa79f92ce34cc6f2.

Reason for revert: failing collector

Change-Id: I9cd39ed98b0ca25c65f74754886eacad422801d2
---
M tests/script_tests.py
1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/script_tests.py b/tests/script_tests.py
index 435683e..d60ce6c 100755
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -306,15 +306,13 @@
                            .format(script_name, arguments))
 
             if script_name in dct['_expected_failures']:
-                if name == 'TestScriptGenerator':
-                    continue  # do not test it
                 dct[test_name] = unittest.expectedFailure(dct[test_name])
             elif script_name in dct['_allowed_failures']:
                 dct[test_name] = unittest.skip(
                     '{} is in _allowed_failures set'
                     .format(script_name))(dct[test_name])
             elif script_name in failed_dep_script_set \
-                    and name == 'TestScriptSimulate':
+                    and arguments == '-simulate':
                 dct[test_name] = unittest.skip(
                     '{} has dependencies; skipping'
                     .format(script_name))(dct[test_name])

