Merge lp:~noise/tanuki-agent/test_tarball2 into lp:tanuki-agent

[Bret Barker]

working GM test with provkit and test_tarball2

The tutorial still needs work, but I just did a successful run with --local-test using a hacked up test_opp.json!

[Bret Barker (noise)]

self-approving as it's trivial.

review: Approve

[Tanuki Bot (tanuki-bot)]

The attempt to merge lp:~noise/tanuki-agent/test_tarball2 into lp:tanuki-agent failed. Below is the output from the failed tests.

rm -rf env logs
rm -f version_info.py
find . -name '*.pyc' -delete
find . -name '*.~*' -delete
virtualenv -p python3 env
Using base prefix '/usr'
New python executable in env/bin/python3
Also creating executable in env/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
bzr version-info -r "-1" --format=custom --template="revno = '{revno}'\n" > "version_info.py" || echo "revno = 'UNKNOWN'" > "version_info.py"
rm -rf /tmp/pip-cache
bzr branch lp:~tanuki/tanuki-agent/pip-cache /tmp/pip-cache
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking docopt==0.6.2 (from -r requirements.txt (line 1))
Downloading/unpacking requests==2.7.0 (from -r requirements.txt (line 2))
Downloading/unpacking requests-oauthlib==0.5.0 (from -r requirements.txt (line 3))
Downloading/unpacking oauthlib==1.0.3 (from -r requirements.txt (line 4))
Installing collected packages: docopt, requests, requests-oauthlib, oauthlib
Successfully installed docopt requests requests-oauthlib oauthlib
Cleaning up...
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r test_requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking flake8==2.4.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking pytest==2.7.2 (from -r test_requirements.txt (line 2))
Downloading/unpacking pytest-capturelog==0.7 (from -r test_requirements.txt (line 3))
Downloading/unpacking Markdown==2.6.2 (from -r test_requirements.txt (line 4))
Downloading/unpacking pep8>=1.5.7,!=1.6.0,!=1.6.1,!=1.6.2 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking py>=1.4.29 (from pytest==2.7.2->-r test_requirements.txt (line 2))
Installing collected packages: flake8, pytest, pytest-capturelog, Markdown, pep8, pyflakes, mccabe, py
Successfully installed flake8 pytest pytest-capturelog Markdown pep8 pyflakes mccabe py
Cleaning up...
rm -rf logs
env/bin/py.test agent.py test_agent.py
============================= test session starts ==============================
platform linux -- Python 3.4.3 -- py-1.4.30 -- pytest-2.7.2
rootdir: /tmp/tarmac/branch.XQZoeI, inifile:
plugins: capturelog
collected 49 items

test_agent.py .................................................

========================== 49 passed in 0.35 seconds ===========================
env/bin/flake8 *.py scripts/*.py --max-line-length=99
env/bin/flake8 rpi2-sample-provkit/setup rpi2-sample-provkit/provision rpi2-sample-provkit/provision2 rpi2-sample-provkit/runtest rpi2-sample-provkit/sshrobot rpi2-sample-provkit/utils.py --max-line-length=99 --builtins=raw_input
env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test* --max-line-length=99
rpi2-sample-provkit/test_tarball_content/test2:47:1: W293 blank line contains whitespace...

[Tanuki Bot (tanuki-bot)]

The attempt to merge lp:~noise/tanuki-agent/test_tarball2 into lp:tanuki-agent failed. Below is the output from the failed tests.

rm -rf env logs
rm -f version_info.py
find . -name '*.pyc' -delete
find . -name '*.~*' -delete
virtualenv -p python3 env
Using base prefix '/usr'
New python executable in env/bin/python3
Also creating executable in env/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
bzr version-info -r "-1" --format=custom --template="revno = '{revno}'\n" > "version_info.py" || echo "revno = 'UNKNOWN'" > "version_info.py"
rm -rf /tmp/pip-cache
bzr branch lp:~tanuki/tanuki-agent/pip-cache /tmp/pip-cache
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking docopt==0.6.2 (from -r requirements.txt (line 1))
Downloading/unpacking requests==2.7.0 (from -r requirements.txt (line 2))
Downloading/unpacking requests-oauthlib==0.5.0 (from -r requirements.txt (line 3))
Downloading/unpacking oauthlib==1.0.3 (from -r requirements.txt (line 4))
Installing collected packages: docopt, requests, requests-oauthlib, oauthlib
Successfully installed docopt requests requests-oauthlib oauthlib
Cleaning up...
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r test_requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking flake8==2.4.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking pytest==2.7.2 (from -r test_requirements.txt (line 2))
Downloading/unpacking pytest-capturelog==0.7 (from -r test_requirements.txt (line 3))
Downloading/unpacking Markdown==2.6.2 (from -r test_requirements.txt (line 4))
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking pep8>=1.5.7,!=1.6.0,!=1.6.1,!=1.6.2 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking py>=1.4.29 (from pytest==2.7.2->-r test_requirements.txt (line 2))
Installing collected packages: flake8, pytest, pytest-capturelog, Markdown, mccabe, pep8, pyflakes, py
Successfully installed flake8 pytest pytest-capturelog Markdown mccabe pep8 pyflakes py
Cleaning up...
rm -rf logs
env/bin/py.test agent.py test_agent.py
============================= test session starts ==============================
platform linux -- Python 3.4.3 -- py-1.4.30 -- pytest-2.7.2
rootdir: /tmp/tarmac/branch.lxaHmG, inifile:
plugins: capturelog
collected 49 items

test_agent.py .................................................

========================== 49 passed in 0.40 seconds ===========================
env/bin/flake8 *.py scripts/*.py --max-line-length=99
env/bin/flake8 rpi2-sample-provkit/setup rpi2-sample-provkit/provision rpi2-sample-provkit/provision2 rpi2-sample-provkit/runtest rpi2-sample-provkit/sshrobot rpi2-sample-provkit/utils.py --max-line-length=99 --builtins=raw_input
env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test* --max-line-length=99
rpi2-sample-provkit/test_tarball_content/test2:47:1: W293 blank line contains whitespace...

[Tanuki Bot (tanuki-bot)]

The attempt to merge lp:~noise/tanuki-agent/test_tarball2 into lp:tanuki-agent failed. Below is the output from the failed tests.

rm -rf env logs
rm -f version_info.py
find . -name '*.pyc' -delete
find . -name '*.~*' -delete
virtualenv -p python3 env
Using base prefix '/usr'
New python executable in env/bin/python3
Also creating executable in env/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
bzr version-info -r "-1" --format=custom --template="revno = '{revno}'\n" > "version_info.py" || echo "revno = 'UNKNOWN'" > "version_info.py"
rm -rf /tmp/pip-cache
bzr branch lp:~tanuki/tanuki-agent/pip-cache /tmp/pip-cache
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking docopt==0.6.2 (from -r requirements.txt (line 1))
Downloading/unpacking requests==2.7.0 (from -r requirements.txt (line 2))
Downloading/unpacking requests-oauthlib==0.5.0 (from -r requirements.txt (line 3))
Downloading/unpacking oauthlib==1.0.3 (from -r requirements.txt (line 4))
Installing collected packages: docopt, requests, requests-oauthlib, oauthlib
Successfully installed docopt requests requests-oauthlib oauthlib
Cleaning up...
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r test_requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking flake8==2.4.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking pytest==2.7.2 (from -r test_requirements.txt (line 2))
Downloading/unpacking pytest-capturelog==0.7 (from -r test_requirements.txt (line 3))
Downloading/unpacking Markdown==2.6.2 (from -r test_requirements.txt (line 4))
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking pep8>=1.5.7,!=1.6.0,!=1.6.1,!=1.6.2 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking py>=1.4.29 (from pytest==2.7.2->-r test_requirements.txt (line 2))
Installing collected packages: flake8, pytest, pytest-capturelog, Markdown, pyflakes, pep8, mccabe, py
Successfully installed flake8 pytest pytest-capturelog Markdown pyflakes pep8 mccabe py
Cleaning up...
rm -rf logs
env/bin/py.test agent.py test_agent.py
============================= test session starts ==============================
platform linux -- Python 3.4.3 -- py-1.4.30 -- pytest-2.7.2
rootdir: /tmp/tarmac/branch.M0RnFR, inifile:
plugins: capturelog
collected 49 items

test_agent.py .................................................

========================== 49 passed in 0.40 seconds ===========================
env/bin/flake8 *.py scripts/*.py --max-line-length=99
env/bin/flake8 rpi2-sample-provkit/setup rpi2-sample-provkit/provision rpi2-sample-provkit/provision2 rpi2-sample-provkit/runtest rpi2-sample-provkit/sshrobot rpi2-sample-provkit/utils.py --max-line-length=99 --builtins=raw_input
env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test* --max-line-length=99
rpi2-sample-provkit/test_tarball_content/test2:47:1: W293 blank line contains whitespace...

[Tanuki Bot (tanuki-bot)]

The attempt to merge lp:~noise/tanuki-agent/test_tarball2 into lp:tanuki-agent failed. Below is the output from the failed tests.

rm -rf env logs
rm -f version_info.py
find . -name '*.pyc' -delete
find . -name '*.~*' -delete
virtualenv -p python3 env
Using base prefix '/usr'
New python executable in env/bin/python3
Also creating executable in env/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
bzr version-info -r "-1" --format=custom --template="revno = '{revno}'\n" > "version_info.py" || echo "revno = 'UNKNOWN'" > "version_info.py"
rm -rf /tmp/pip-cache
bzr branch lp:~tanuki/tanuki-agent/pip-cache /tmp/pip-cache
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking docopt==0.6.2 (from -r requirements.txt (line 1))
Downloading/unpacking requests==2.7.0 (from -r requirements.txt (line 2))
Downloading/unpacking requests-oauthlib==0.5.0 (from -r requirements.txt (line 3))
Downloading/unpacking oauthlib==1.0.3 (from -r requirements.txt (line 4))
Installing collected packages: docopt, requests, requests-oauthlib, oauthlib
Successfully installed docopt requests requests-oauthlib oauthlib
Cleaning up...
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r test_requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking flake8==2.4.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking pytest==2.7.2 (from -r test_requirements.txt (line 2))
Downloading/unpacking pytest-capturelog==0.7 (from -r test_requirements.txt (line 3))
Downloading/unpacking Markdown==2.6.2 (from -r test_requirements.txt (line 4))
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking pep8>=1.5.7,!=1.6.0,!=1.6.1,!=1.6.2 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking py>=1.4.29 (from pytest==2.7.2->-r test_requirements.txt (line 2))
Installing collected packages: flake8, pytest, pytest-capturelog, Markdown, pyflakes, pep8, mccabe, py
Successfully installed flake8 pytest pytest-capturelog Markdown pyflakes pep8 mccabe py
Cleaning up...
rm -rf logs
env/bin/py.test agent.py test_agent.py
============================= test session starts ==============================
platform linux -- Python 3.4.3 -- py-1.4.30 -- pytest-2.7.2
rootdir: /tmp/tarmac/branch.xQL4ik, inifile:
plugins: capturelog
collected 49 items

test_agent.py .................................................

========================== 49 passed in 0.61 seconds ===========================
env/bin/flake8 *.py scripts/*.py --max-line-length=99
env/bin/flake8 rpi2-sample-provkit/setup rpi2-sample-provkit/provision rpi2-sample-provkit/provision2 rpi2-sample-provkit/runtest rpi2-sample-provkit/sshrobot rpi2-sample-provkit/utils.py --max-line-length=99 --builtins=raw_input
env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test* --max-line-length=99
rpi2-sample-provkit/test_tarball_content/test2:47:1: W293 blank line contains whitespace...

[Tanuki Bot (tanuki-bot)]

The attempt to merge lp:~noise/tanuki-agent/test_tarball2 into lp:tanuki-agent failed. Below is the output from the failed tests.

rm -rf env logs
rm -f version_info.py
find . -name '*.pyc' -delete
find . -name '*.~*' -delete
virtualenv -p python3 env
Using base prefix '/usr'
New python executable in env/bin/python3
Also creating executable in env/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
bzr version-info -r "-1" --format=custom --template="revno = '{revno}'\n" > "version_info.py" || echo "revno = 'UNKNOWN'" > "version_info.py"
rm -rf /tmp/pip-cache
bzr branch lp:~tanuki/tanuki-agent/pip-cache /tmp/pip-cache
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking docopt==0.6.2 (from -r requirements.txt (line 1))
Downloading/unpacking requests==2.7.0 (from -r requirements.txt (line 2))
Downloading/unpacking requests-oauthlib==0.5.0 (from -r requirements.txt (line 3))
Downloading/unpacking oauthlib==1.0.3 (from -r requirements.txt (line 4))
Installing collected packages: docopt, requests, requests-oauthlib, oauthlib
Successfully installed docopt requests requests-oauthlib oauthlib
Cleaning up...
env/bin/pip install --no-index --find-links=/tmp/pip-cache -r test_requirements.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking flake8==2.4.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking pytest==2.7.2 (from -r test_requirements.txt (line 2))
Downloading/unpacking pytest-capturelog==0.7 (from -r test_requirements.txt (line 3))
Downloading/unpacking Markdown==2.6.2 (from -r test_requirements.txt (line 4))
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking pep8>=1.5.7,!=1.6.0,!=1.6.1,!=1.6.2 (from flake8==2.4.1->-r test_requirements.txt (line 1))
Downloading/unpacking py>=1.4.29 (from pytest==2.7.2->-r test_requirements.txt (line 2))
Installing collected packages: flake8, pytest, pytest-capturelog, Markdown, pyflakes, mccabe, pep8, py
Successfully installed flake8 pytest pytest-capturelog Markdown pyflakes mccabe pep8 py
Cleaning up...
rm -rf logs
env/bin/py.test agent.py test_agent.py
============================= test session starts ==============================
platform linux -- Python 3.4.3 -- py-1.4.30 -- pytest-2.7.2
rootdir: /tmp/tarmac/branch.wFQGO8, inifile:
plugins: capturelog
collected 49 items

test_agent.py .................................................

========================== 49 passed in 0.62 seconds ===========================
env/bin/flake8 *.py scripts/*.py --max-line-length=99
env/bin/flake8 rpi2-sample-provkit/setup rpi2-sample-provkit/provision rpi2-sample-provkit/provision2 rpi2-sample-provkit/runtest rpi2-sample-provkit/sshrobot rpi2-sample-provkit/utils.py --max-line-length=99 --builtins=raw_input
env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test* --max-line-length=99
rpi2-sample-provkit/test_tarball_content/test2:47:1: W293 blank line contains whitespace...

[lp:~noise/tanuki-agent/test_tarball2]

170. By Bret Barker on 2015-11-25

lint

=== modified file 'Makefile'
--- Makefile	2015-11-23 20:17:52 +0000
+++ Makefile	2015-11-25 20:26:07 +0000
@@ -20,7 +20,7 @@
 raw-lint:
 	env/bin/flake8 *.py scripts/*.py --max-line-length=99
 	env/bin/flake8 rpi2-sample-provkit/setup rpi2-sample-provkit/provision rpi2-sample-provkit/provision2 rpi2-sample-provkit/runtest rpi2-sample-provkit/sshrobot rpi2-sample-provkit/utils.py --max-line-length=99 --builtins=raw_input
-	env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test --max-line-length=99
+	env/bin/flake8 rpi2-sample-provkit/test_tarball_content/test* --max-line-length=99
 
 raw-test:
 	rm -rf logs
@@ -57,6 +57,7 @@
 
 test_tarball:
 	tar czvf test_tarball.tar.gz -C rpi2-sample-provkit/test_tarball_content test
+	tar czvf test_tarball2.tar.gz -C rpi2-sample-provkit/test_tarball_content test2
 
 version:
 	bzr version-info -r $(REVNO) --format=custom --template="revno = '{revno}'\n" > $(VERSION_FILENAME) || echo "revno = 'UNKNOWN'" > $(VERSION_FILENAME)

=== added file 'rpi2-sample-provkit/test_tarball_content/test2'
--- rpi2-sample-provkit/test_tarball_content/test2	1970-01-01 00:00:00 +0000
+++ rpi2-sample-provkit/test_tarball_content/test2	2015-11-25 20:26:07 +0000
@@ -0,0 +1,71 @@
+#!/usr/bin/python2
+
+from __future__ import print_function
+
+import codecs
+import json
+import os
+import subprocess
+
+
+def check_test_snap(address, port):
+    """Get the version of the test snap."""
+    cmd = ['ssh', '-o' 'StrictHostKeyChecking=no',
+           '-o', 'UserKnownHostsFile=/dev/null', '-l', 'ubuntu',
+           '-p', port, address, '/apps/bin/test-snap.test-snap -v']
+    output = subprocess.check_output(cmd)
+    return output.decode('utf8').strip()
+
+
+CHECKABLES = [
+    ('test-snap', check_test_snap),
+]
+RESULT_JSON = "../spi_test_result.json"
+
+
+def main():
+    """Main entry point."""
+    rpi2_address = os.environ['RPI2_IP']
+    rpi2_ssh_port = os.environ['RPI2_SSH_PORT']
+    test_opp_path = os.environ['TEST_OPPORTUNITY']
+    with codecs.open(test_opp_path, 'rt', encoding='utf8') as fh:
+        test_opp = json.load(fh)
+
+    # find snap(s) to check version
+    snaps = {}
+    for snap_entry in test_opp['base_snaps']:
+        snaps[snap_entry['name']] = snap_entry['sequence']
+        # strip origin to handle test-snap from any myapps user
+        if 'test-snap' in snap_entry['name']:
+            snaps['test-snap'] = snap_entry['sequence']
+
+    for snap_name, snap_revno in test_opp['extra_snaps']:
+        snaps[snap_name] = snap_revno
+        # strip origin to handle test-snap from any myapps user
+        if 'test-snap' in snap_name:
+            snaps['test-snap'] = snap_revno
+
+    # for each snap, get version executing it inside the raspi, and compare
+    for snap_name, check_function in CHECKABLES:
+        real_revno = check_function(rpi2_address, rpi2_ssh_port)
+        print('got installed test-snap sequence: ' + real_revno)
+        expected = str(snaps[snap_name])
+        assert real_revno == expected, "real={!r} != expected={!r}".format(real_revno, expected)
+    if os.path.exists(RESULT_JSON):
+        load = True
+        mode = "r+t"
+    else:
+        load = False
+        mode = "wt"
+    with codecs.open(RESULT_JSON, mode, encoding="utf8") as fh:
+        if load:
+            res = json.load(fh)
+        else:
+            res = {}
+        res['result'] = 'OK'
+        fh.seek(0)
+        json.dump(res, fh)
+
+
+if __name__ == '__main__':
+    main()