tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 

Conflicts:
	tests/console/PAN8.py
This commit is contained in:
cesar991 2016-07-14 12:07:19 +02:00
parent df0732616e 6398287b7e
commit b3bd8a95c4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/console/PAN8.py
View File

@ -45,12 +45,17 @@ class PAN8(PandoraWebDriverTestCase):
detect_and_pass_all_wizards(driver) detect_and_pass_all_wizards(driver)
search_agent(driver,"PAN_8") search_agent(driver,"PAN_8")
<<<<<<< HEAD
time.sleep(3) time.sleep(3)
=======
>>>>>>> 6398287b7eb773a25cec3533a69f46cabaf6c0a5
try: try:
#The user should be able to see the module with Tag #The user should be able to see the module with Tag
module = driver.find_element_by_xpath('//td[contains(.,"With tag")]')
self.assertEqual("With tag" in driver.page_source,True) self.assertEqual("With tag" in driver.page_source,True)
except AssertionError as e: except AssertionError as e:
self.verificationErrors.append(str(e)) self.verificationErrors.append(str(e))