Update to master and switch to using the schema

canonical · Nov 6, 2015 · 341e395 · 341e395
2 parents 48cf9ff + 95e4d65
commit 341e395
Show file tree

Hide file tree

Showing 40 changed files with 647 additions and 283 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ install:
   # PPA for snappy.
   - sudo apt-add-repository -y ppa:snappy-dev/tools-proposed
   - sudo apt-get update -qq
-  - sudo apt-get install -qq build-essential dpkg-dev plainbox pyflakes python3-apt python3-coverage python3-fixtures python3-jsonschema python3-mccabe python3-pep8 python3-requests python3-testscenarios python3-yaml ubuntu-snappy-cli
+  - sudo apt-get install -qq build-essential dpkg-dev plainbox pyflakes python3-apt python3-coverage python3-fixtures python3-jsonschema python3-mccabe python3-pep8 python3-requests python3-testscenarios python3-yaml ubuntu-snappy-cli python3-lxml
 script:
   - ./runtests.sh $TEST_SUITE
 after_success:

diff --git a/bin/snapcraft b/bin/snapcraft
@@ -19,7 +19,7 @@ import os
 import sys
 
 # make running from bzr snapshot easy
-topdir = os.path.abspath(os.path.join(__file__, "..", ".."))
+topdir = os.path.abspath(os.path.join(__file__, '..', '..'))
 if os.path.exists(os.path.join(topdir, 'setup.py')):
     sys.path = [topdir] + sys.path
 
@@ -28,6 +28,6 @@ import snapcraft.main
 import snapcraft.dirs
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     snapcraft.dirs.setup_dirs()
     snapcraft.main.main()
diff --git a/bin/snapcraft-coverage b/bin/snapcraft-coverage
@@ -21,7 +21,7 @@ import sys
 import coverage
 
 # make running from bzr snapshot easy
-topdir = os.path.abspath(os.path.join(__file__, "..", ".."))
+topdir = os.path.abspath(os.path.join(__file__, '..', '..'))
 if os.path.exists(os.path.join(topdir, 'setup.py')):
     sys.path = [topdir] + sys.path
 
@@ -30,7 +30,7 @@ import snapcraft.main
 import snapcraft.dirs
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     cov = coverage.coverage(
         data_file=os.path.join(topdir, '.coverage'), data_suffix=True,
         branch=True, source=['snapcraft'])

diff --git a/examples/py2-project/sha3sum.py b/examples/py2-project/sha3sum.py
@@ -5,10 +5,10 @@
 import spongeshaker.sha3
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     # 224 is the default from sha3sum
     h = spongeshaker.sha3.sha3_224()
-    with open(sys.argv[1], "rb") as fp:
+    with open(sys.argv[1], 'rb') as fp:
         data = fp.read()
     h.update(data)
     print(h.hexdigest())
diff --git a/examples/py3-project/sha3sum.py b/examples/py3-project/sha3sum.py
@@ -5,10 +5,10 @@
 import spongeshaker.sha3
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     # 224 is the default from sha3sum
     h = spongeshaker.sha3.sha3_224()
-    with open(sys.argv[1], "rb") as fp:
+    with open(sys.argv[1], 'rb') as fp:
         data = fp.read()
     h.update(data)
     print(h.hexdigest())
diff --git a/integration-tests/data/simple-circle/circle/icon.svg b/integration-tests/data/simple-circle/circle/icon.svg
@@ -0,0 +1 @@
+../icon.svg
diff --git a/integration-tests/data/simple-circle/circle/snapcraft.yaml b/integration-tests/data/simple-circle/circle/snapcraft.yaml
@@ -0,0 +1,56 @@
+name: real-circle
+summary: A big bad circle
+description: |
+    A snapcraft.yaml that lists a set of parts that are
+    in a circular dependency chain. Snapcraft should NOT
+    accept this snapcraft.yaml.
+version: 1.0
+vendor: round@circle.square.com
+icon: icon.svg
+
+parts:
+    a:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [last]
+    b:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [a]
+    c:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [b]
+    d:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [c]
+    e:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [d]
+    f:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [e]
+    g:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [f]
+    h:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [g]
+    last:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [h]
diff --git a/integration-tests/data/simple-circle/icon.svg b/integration-tests/data/simple-circle/icon.svg
diff --git a/integration-tests/data/simple-circle/tree/icon.svg b/integration-tests/data/simple-circle/tree/icon.svg
@@ -0,0 +1 @@
+../icon.svg
diff --git a/integration-tests/data/simple-circle/tree/snapcraft.yaml b/integration-tests/data/simple-circle/tree/snapcraft.yaml
@@ -0,0 +1,95 @@
+name: dep-tree
+summary: A tree of things to make sure work
+description: |
+    A snapcraft.yaml that has a relatively complex tree of
+    dependencies that can stress test the depedency resolution
+    code in Snapcraft.
+version: 1.0
+vendor: deps@tree.com
+icon: icon.svg
+
+parts:
+    root:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+    a:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [root]
+    b:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [root]
+    c:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [root]
+    aa:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [a]
+    ab:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [a]
+    ac:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [a]
+    ba:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [b]
+    bb:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [b]
+    bc:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [b]
+    ca:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [c]
+    cb:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [c]
+    cc:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [c]
+    x:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [aa, ba, ca]
+    y:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [ab, bb, cb]
+    z:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [ac, bc, cc]
+    last:
+        plugin: copy
+        files:
+            icon.svg: icon.svg
+        after: [x, y, z]
diff --git a/integration-tests/manage.py b/integration-tests/manage.py
@@ -15,6 +15,6 @@
 
 setup(
     name='2015.com.canonical.snapcraft:tests',
-    version="1.0",
-    description=N_("Plainbox test provider for Snapcraft")
+    version='1.0',
+    description=N_('Plainbox test provider for Snapcraft')
 )
diff --git a/integration-tests/units/examples.pxu b/integration-tests/units/examples.pxu
@@ -1,10 +1,89 @@
-id: snapcraft/examples/build
+id: snapcraft/examples/downloader-with-wiki-parts
 plugin: shell
 command:
-    set -e
-    for example in ${PLAINBOX_PROVIDER_DATA}/examples/*
-    do
-      cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
-      cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
-      rm -rf ${PLAINBOX_SESSION_SHARE}/*
-    done
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/downloader-with-wiki-parts
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/godd
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/godd
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/gopaste
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/gopaste
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/java-hello-world
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/java-hello-world
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/libpipeline
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/libpipeline
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/py2project
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/py2project
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/py3project
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/py3project
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/ros
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/ros
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/tomcat-maven-webapp
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/tomcat-maven-webapp
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
+
+id: snapcraft/examples/webcam-webui
+plugin: shell
+command:
+  set -e
+  example=${PLAINBOX_PROVIDER_DATA}/examples/webcam-webui
+  cp -rT ${example//:} ${PLAINBOX_SESSION_SHARE}
+  cd ${PLAINBOX_SESSION_SHARE} && ${SNAPCRAFT}
+  rm -rf ${PLAINBOX_SESSION_SHARE}/*
diff --git a/integration-tests/units/jobs.pxu b/integration-tests/units/jobs.pxu
@@ -94,10 +94,9 @@ command:
     set -ex
     cp -rT $PLAINBOX_PROVIDER_DATA/local-source .
     ${SNAPCRAFT} build
-    test -e stamp-all
-    test "$(readlink parts/make-project/build)" = "$(pwd)"
+    test -e parts/make-project/build/stamp-all
     ${SNAPCRAFT} stage
-    test -e stamp-install
+    test -e parts/make-project/build/stamp-install
 flags: simple has-leftovers
 
 id: snapcraft/normal/local-plugin
@@ -401,3 +400,17 @@ command:
     ${SNAPCRAFT} shell xml2-config --cflags | grep -q `pwd`
     ${SNAPCRAFT} shell xslt-config --cflags | grep -q `pwd`
 flags: simple has-leftovers
+
+id: snapcraft/circle/tree-dependencies
+command:
+    set -ex
+    cp -rTL $PLAINBOX_PROVIDER_DATA/simple-circle/tree .
+    ${SNAPCRAFT} pull
+flags: simple has-leftovers
+
+id: snapcraft/circle/circle-dependencies
+command:
+    set -ex
+    cp -rTL $PLAINBOX_PROVIDER_DATA/simple-circle/circle .
+    ! ${SNAPCRAFT} pull
+flags: simple has-leftovers