Remove test classes from python marionette tests

SeleniumHQ · Oct 21, 2016 · fff22cd · fff22cd
1 parent fe594a6
commit fff22cd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/py/test/selenium/webdriver/marionette/mn_context_tests.py b/py/test/selenium/webdriver/marionette/mn_context_tests.py
@@ -16,15 +16,12 @@
 # under the License.
 
 
-class TestUsingContext(object):
+def test_context_sets_correct_context_and_returns(driver):
 
-    def test_context_sets_correct_context_and_returns(self, driver):
-
-        def get_context():
-            return driver.execute('GET_CONTEXT').pop('value')
-
-        assert get_context() == driver.CONTEXT_CONTENT
-        with driver.context(driver.CONTEXT_CHROME):
-            assert get_context() == driver.CONTEXT_CHROME
-        assert get_context() == driver.CONTEXT_CONTENT
+    def get_context():
+        return driver.execute('GET_CONTEXT').pop('value')
 
+    assert get_context() == driver.CONTEXT_CONTENT
+    with driver.context(driver.CONTEXT_CHROME):
+        assert get_context() == driver.CONTEXT_CHROME
+    assert get_context() == driver.CONTEXT_CONTENT
diff --git a/py/test/selenium/webdriver/marionette/mn_launcher_tests.py b/py/test/selenium/webdriver/marionette/mn_launcher_tests.py
@@ -16,7 +16,5 @@
 # under the License.
 
 
-class TestMarionetteLauncher(object):
-
-    def test_launch_and_close_browser(self, driver):
-        assert 'appBuildId' in driver.capabilities
+def test_launch_and_close_browser(driver):
+    assert 'appBuildId' in driver.capabilities
diff --git a/py/test/selenium/webdriver/marionette/mn_set_context_tests.py b/py/test/selenium/webdriver/marionette/mn_set_context_tests.py
@@ -16,12 +16,6 @@
 # under the License.
 
 
-from selenium.webdriver import Firefox
-
-
-class TestMarionetteSpecific(object):
-
-    def test_we_can_switch_context_to_chrome(self, capabilities):
-        driver = Firefox(capabilities=capabilities)
-        driver.set_context('chrome')
-        assert 1 == driver.execute_script("var c = Components.classes; return 1;")
+def test_we_can_switch_context_to_chrome(driver):
+    driver.set_context('chrome')
+    assert 1 == driver.execute_script("var c = Components.classes; return 1;")