Merge lp:~elopio/selenium-simple-test/fix-1089498-results_directory into lp:selenium-simple-test

[Leo Arias]

Create the results directory for SSTTestCases.

Create the results directory for SSTTestCases.

[lp:~elopio/selenium-simple-test/fix-1089498-results_directory]

340. By Leo Arias on 2013-01-03

Set a name for the results directory of the test, and remove it afterwards.

341. By Leo Arias on 2013-01-03

Run the test directly, per Corey's suggestion.

342. By Leo Arias on 2013-01-03

Do not start the browser.

343. By Leo Arias on 2013-01-03

It seems clearer to overwrite the start_browser in the test case.

[Corey Goldberg (coreygoldberg)]

looks good now.

----
all tests passed with:
cgoldberg@zerodown:~/code/fix-1089498-results_directory$ ./ci.sh --bootstrap --flake8 --unit --acceptance

environment info:
Python 2.7.3
Django 1.4.3
Selenium 2.28.0
SST version: 0.2.3dev
Mozilla Firefox 17.0.1
----------------------------------

review: Approve

=== modified file 'src/sst/actions.py'
--- src/sst/actions.py	2013-01-03 17:28:03 +0000
+++ src/sst/actions.py	2013-01-03 20:59:21 +0000
@@ -759,7 +759,7 @@
             except AssertionError as e:
                 pass
             else:
-                if result != False:
+                if result is not False:
                     break
             if time.time() > max_time:
                 error = 'Timed out waiting for: %s' % msg

=== modified file 'src/sst/runtests.py'
--- src/sst/runtests.py	2012-12-20 23:41:01 +0000
+++ src/sst/runtests.py	2013-01-03 20:59:21 +0000
@@ -264,6 +264,7 @@
     wait_poll = 0.1
     base_url = None
 
+    results_directory = _get_full_path('results')
     screenshots_on = False
     debug_post_mortem = False
     extended_report = False
@@ -280,6 +281,8 @@
             # a new one for the current test, scheduling the shutdown for the
             # end of the test.
             self.xvfb = use_xvfb_server(self)
+        config.results_directory = self.results_directory
+        _make_results_dir()
         self.start_browser()
         self.addCleanup(self.stop_browser)
 

=== modified file 'src/sst/tests/test_sst_run.py'
--- src/sst/tests/test_sst_run.py	2012-12-07 09:48:13 +0000
+++ src/sst/tests/test_sst_run.py	2013-01-03 20:59:21 +0000
@@ -1,6 +1,5 @@
 import testtools
 
-
 from sst import runtests
 
 

=== added file 'src/sst/tests/test_sst_test_case.py'
--- src/sst/tests/test_sst_test_case.py	1970-01-01 00:00:00 +0000
+++ src/sst/tests/test_sst_test_case.py	2013-01-03 20:59:21 +0000
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+#
+#   Copyright (c) 2013 Canonical Ltd.
+#
+#   This file is part of: SST (selenium-simple-test)
+#   https://launchpad.net/selenium-simple-test
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import os
+
+import testtools
+
+from sst import runtests
+from sst import config
+
+
+class FooSSTTestCase(runtests.SSTTestCase):
+
+    def start_browser(self):
+        # We do not need to start the browser.
+        pass
+
+    def _test_foo(self):
+        pass
+
+
+class TestSSTTestCase(testtools.TestCase):
+
+    def test_results_directory_is_created(self):
+        test = FooSSTTestCase('_test_foo')
+        test.results_directory = 'foo_test_results'
+        test.run()
+        self.assertEquals(config.results_directory, 'foo_test_results')
+        self.assertTrue(os.path.exists(config.results_directory))
+        # Tear down.
+        os.removedirs(config.results_directory)