Merge lp://staging/~lazypower/charms/precise/mediawiki/ci-fix into lp://staging/charms/mediawiki
Proposed by
Charles Butler
Status: | Merged |
---|---|
Merged at revision: | 77 |
Proposed branch: | lp://staging/~lazypower/charms/precise/mediawiki/ci-fix |
Merge into: | lp://staging/charms/mediawiki |
Diff against target: |
62 lines (+17/-14) 4 files modified
.bzrignore (+3/-0) tests/00-setup (+10/-0) tests/00_setup.sh (+0/-10) tests/100-deploy (+4/-4) |
To merge this branch: | bzr merge lp://staging/~lazypower/charms/precise/mediawiki/ci-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+207761@code.staging.launchpad.net |
Description of the change
Moved test files around to mimic charm add tests
This setup has been tested and validated against a clean juju host running
through vagrant. All dependencies are met, test files are executing and
returning positive results
2014-02-22 00:08:54 Deployment complete in 353.25 seconds
juju-test.
juju-test INFO : Results: 1 passed, 0 failed, 0 errored
To post a comment you must log in.
Reviewers: mp+207761_ code.launchpad. net,
Message:
Please take a look.
Description:
Moved test files around to mimic charm add tests
This setup has been tested and validated against a clean juju host
running
through vagrant. All dependencies are met, test files are executing and
returning positive results
2014-02-22 00:08:54 Deployment complete in 353.25 seconds conductor. 100-deploy RESULT : ✔
juju-test.
juju-test INFO : Results: 1 passed, 0 failed, 0 errored
https:/ /code.launchpad .net/~lazypower /charms/ precise/ mediawiki/ ci-fix/ +merge/ 207761
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/67220043/
Affected files (+19, -14 lines):
A .bzrignore
A [revision details]
A tests/00-setup
D tests/00_setup.sh
M tests/100-deploy
Index: .bzrignore setup.sh
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2014-02-22 00:42:44 +0000
@@ -0,0 +1,3 @@
+.vagrant
+Vagrantfile
+juju-vagrant-
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: tests/00-setup
=== added file 'tests/00-setup'
--- tests/00-setup 1970-01-01 00:00:00 +0000
+++ tests/00-setup 2014-02-21 23:29:26 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#TODO: Some of the python3 packs may not be available in precise.
+
+sudo apt-get install python3-setuptools -y
+sudo apt-add-repository ppa:juju/stable -y
+sudo apt-get update
+
+sudo apt-get install amulet python3 python3-requests python3-dev
python3-pip phantomjs -y
+sudo pip3 install splinter selenium
Index: tests/00_setup.sh
=== removed file 'tests/00_setup.sh'
--- tests/00_setup.sh 2014-02-19 22:04:58 +0000
+++ tests/00_setup.sh 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-#TODO: Some of the python3 packs may not be available in precise.
-
-sudo apt-get install python3-setuptools -y
-sudo apt-add-repository ppa:juju/stable -y
-sudo apt-get update
-
-sudo apt-get install amulet python3 python3-requests python3-dev
python3-pip phantomjs -y
-sudo pip3 install splinter selenium
Index: tests/100-deploy
=== modified file 'tests/100-deploy'
--- tests/100-deploy 2014-02-20 00:58:28 +0000
+++ tests/100-deploy 2014-02-21 23:29:26 +0000
@@ -69,16 +69,16 @@
title = str(browser. title). find("Log in") raise_status( amulet. FAIL, msg="Failed login test.") raise_status( amulet. FAIL, msg="Failed login test.")
if title == -1:
- amulet.
+ amulet.
title = str(browser. title). find("amulet- wiki") raise_status( amulet. FAIL, msg="Failed to parse provided title") raise_status( amulet. FAIL, msg="Failed to parse provided title")
if title == -1:
- amulet.
+ amulet.
browser. fill("wpName" , 'tom') fill('wpPasswor d', 'swordfish') find_by_ id('wpLoginAtte mpt').first. click()
browser.
browser.
if not browser. is_text_ present( 'tom'): raise_status( amulet. FAIL,
- amulet.
- ...