Run console tests inside the Docker image.

.travis.yml

@@ -1,26 +1,8 @@
 sudo: required
 
-language: python
-python:
-  - 2.7
-
-addons:
-  firefox: "latest"
-
 services:
   - docker
 
-before_install:
-  - sudo apt-get install xvfb
-
-install:
-  - pip install selenium PyVirtualDisplay testtools
-
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-
 script:
   - docker run --name pandorafms -h pandorafms -dt -v "$TRAVIS_BUILD_DIR:/tmp/pandorafms" -p 127.0.0.1:8080:80 pandorafms/pandorafms-base tail -f /var/log/messages
   - docker exec -t pandorafms /tmp/pandorafms/tests/test.sh

tests/console/ACL.py

@@ -12,7 +12,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
-import unittest, time, re
+import unittest2, time, re
 
 class ACLPropagation(PandoraWebDriverTestCase):
 
@@ -177,4 +177,4 @@ class ACLTags(PandoraWebDriverTestCase):
 		self.assertEqual(modules,[])
  
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()

tests/console/Bulk_operations.py

@@ -13,7 +13,7 @@ from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
 
-import unittest, time, re
+import unittest2, time, re
 
 class Bulk_operations(PandoraWebDriverTestCase):
 	
@@ -268,4 +268,4 @@ class Bulk_operations(PandoraWebDriverTestCase):
 		self.assertIsInstance(element,WebElement)	
 
 if __name__ == "__main__":
-        unittest.main()
+        unittest2.main()

tests/console/Collections.py

@@ -12,7 +12,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
-import unittest, time, re
+import unittest2, time, re
 
 
 class Collections(PandoraWebDriverTestCase):
@@ -82,4 +82,4 @@ class Collections(PandoraWebDriverTestCase):
 		self.assertEqual(element,[])
 
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()

tests/console/Misc.py

@@ -14,7 +14,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import StaleElementReferenceException, NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
-import unittest, time, re
+import unittest2, time, re
 
 class Miscellaneous (PandoraWebDriverTestCase):
 
@@ -62,5 +62,5 @@ class Miscellaneous (PandoraWebDriverTestCase):
 		self.assertIsInstance(element,WebElement)
 
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()
 

tests/console/Network_server.py

@@ -9,7 +9,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import StaleElementReferenceException
 from include.module_functions import *
 
-import unittest, time, re
+import unittest2, time, re
 
 class Network_server_module(PandoraWebDriverTestCase):
 
@@ -54,5 +54,5 @@ class Network_server_module(PandoraWebDriverTestCase):
 				break
 
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()
 

tests/console/Planned_downtime.py

@@ -13,7 +13,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
-import unittest, time, re, datetime
+import unittest2, time, re, datetime
 
 
 class PAN13(PandoraWebDriverTestCase):
@@ -162,4 +162,4 @@ class PAN13(PandoraWebDriverTestCase):
 		self.assertNotEqual(event_who_should_be_present_b,[])
 
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()

tests/console/Policies.py

@@ -11,7 +11,7 @@ from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
-import unittest, time, re
+import unittest2, time, re
 
 class Policies(PandoraWebDriverTestCase):
 
@@ -130,4 +130,4 @@ class Policies(PandoraWebDriverTestCase):
 
 
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()

tests/console/Services.py

@@ -14,7 +14,7 @@ from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
 
-import unittest, time, re
+import unittest2, time, re
 
 class SimpleService(PandoraWebDriverTestCase):
 
@@ -275,4 +275,4 @@ class ManualService(PandoraWebDriverTestCase):
 
 	
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()

tests/console/Users.py

@@ -9,7 +9,7 @@ from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver.remote.webelement import WebElement
 
-import unittest, time, re	
+import unittest2, time, re	
 
 class Users(PandoraWebDriverTestCase):
 
@@ -41,5 +41,5 @@ class Users(PandoraWebDriverTestCase):
 			
 		
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()
 

tests/console/include/api_functions.py

@@ -8,7 +8,7 @@ from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
-import unittest, time, re
+import unittest2, time, re
 
 
 def activate_api(driver,api_pwd):

tests/console/include/common_classes_60.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from unittest import TestResult, TestCase
+from unittest2 import TestResult, TestCase
 from common_functions_60 import *
 from datetime import datetime
 from pyvirtualdisplay import Display
@@ -52,7 +52,7 @@ class PandoraWebDriverTestCase(TestCase):
                         cls.display = Display(visible=0, size=(800, 600))
                         cls.display.start()
 			cls.driver = webdriver.Firefox()
-			cls.base_url = "http://127.0.0.1:8080/"
+			cls.base_url = "http://127.0.0.1/"
 		
 	@classmethod
 	def tearDownClass(cls):

tests/console/include/common_functions_60.py

@@ -6,7 +6,7 @@ from selenium.webdriver.support import expected_conditions as EC
 
 import random, time
 import string
-import unittest
+import unittest2
 
 def is_enterprise(func):
         u"""
@@ -22,7 +22,7 @@ def is_enterprise(func):
                 if is_enterprise:
                         return func(*args,**kwargs)
 		else:
-			raise unittest.SkipTest("Skipping test")
+			raise unittest2.SkipTest("Skipping test")
         return inner
 
 

tests/console/include/policy_functions.py

@@ -8,7 +8,7 @@ from module_functions import create_module
 from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoAlertPresentException
-import unittest, time, re
+import unittest2, time, re
 
 
 def create_policy(driver,policy_name,group,description=None):

tests/run_console_tests.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from unittest import *
+from unittest2 import *
 from console.include.common_functions_60 import *
 from console.include.common_classes_60 import *
 #from sauceclient import SauceClient
@@ -15,7 +15,7 @@ is_enterprise = '1' == getenv('ENTERPRISE', False)
 
 a = TestLoader()
 
-tests = a.discover(start_dir='console',pattern='*.py')
+tests = a.discover(start_dir='console',pattern='ACL.py')
 
 c = ArticaTestResult()
 tests.run(c)

tests/utils/selenium_ci_tester/PAN3_testing.py

@@ -6,7 +6,7 @@ from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import Select
 from selenium.common.exceptions import StaleElementReferenceException
-import unittest, time, re
+import unittest2, time, re
 
 
 class PAN3(PandoraWebDriverTestCase):
@@ -67,5 +67,5 @@ class PAN3(PandoraWebDriverTestCase):
 				break
 
 if __name__ == "__main__":
-	unittest.main()
+	unittest2.main()
 

tests/utils/selenium_ci_tester/testpan3.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from unittest import *
+from unittest2 import *
 from console import *
 from console.include.common_functions_60 import *
 from console.include.common_classes_60 import *