Merge lp:~sergiusens/snapcraft/testing-fixes into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Multiple testing additions

[Leo Arias (elopio)]

Looks good.

What about:

python3 $(which flake8) $SRC_PATHS --ignore=E501

to run flake8?

review: Approve

[Sergio Schvezov (sergiusens)]

> Looks good.
>
> What about:
>
> python3 $(which flake8) $SRC_PATHS --ignore=E501
>
> to run flake8?

It is good, but I still have to install python-flake8 AND python3-flake8 so I get python-mccabe, python-pep8 and pyflakes which is cruft and I don't like that :-P

[Zygmunt Krynicki (zyga)]

Just install python3-flake8 and run it via python3 -m

[Sergio Schvezov (sergiusens)]

On Wed, Aug 26, 2015 at 7:48 AM, Zygmunt Krynicki <
<email address hidden>> wrote:

> Just install python3-flake8 and run it via python3 -m
>

Great, but now I have the problem that I don't want to fail on mccabe and
just report it to start fixing it

I'll switch to this as soon as the complexity lowers from 22 ;-)

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file '.bzrignore'
--- .bzrignore	2015-07-09 15:44:05 +0000
+++ .bzrignore	2015-08-27 21:34:59 +0000
@@ -1,9 +1,12 @@
 examples/*/parts/
 examples/*/snap/
 examples/*/stage/
+examples/**/*.snap
 tests/unit/parts/
 tests/unit/snap/
 tests/unit/stage/
 build
 dist
 *.egg-info
+.coverage**
+htmlcov

=== modified file 'debian/control'
--- debian/control	2015-08-27 21:34:59 +0000
+++ debian/control	2015-08-27 21:34:59 +0000
@@ -15,6 +15,7 @@
                python3-apt,
                python3-fixtures,
                python3-jsonschema,
+               python3-mccabe
                python3-setuptools,
                python3-testscenarios,
                python3-yaml,

=== modified file 'runtests.sh'
--- runtests.sh	2015-07-22 14:15:03 +0000
+++ runtests.sh	2015-08-27 21:34:59 +0000
@@ -22,12 +22,29 @@
 
 SRC_PATHS="bin snapcraft snapcraft/tests"
 
+# These three checks could easily be done with flake8 in one shot if
+# we had python3-flake8 provide flake8
 # Ignore 501 (line-too-long)
 pep8 $SRC_PATHS --ignore=E501
 
 pyflakes3 $SRC_PATHS
 
+# mccabe in 'warning' mode as we have high complexity
+mccabe_list=
+for unit in $(find . -type f -name '*.py')
+do
+  output=$(python3 -m mccabe --min 10 "$unit")
+  [ -n "$output" ] && mccabe_list="- $unit:\n  $output\n$mccabe_list"
+done
+
+if [ -n "$mccabe_list" ]; then
+  echo -e "\e[1;31mThe project has gotten complex\e[0m."
+  echo "Here's the list of units exceeding 10:"
+  echo -e "$mccabe_list"
+fi
+
 if which python3-coverage >/dev/null 2>&1; then
+    python3-coverage erase
     python3-coverage run --branch --source snapcraft -m unittest
     mv .coverage .coverage.unit
 else
@@ -90,7 +107,11 @@
 if which python3-coverage >/dev/null 2>&1; then
     python3-coverage combine
     python3-coverage report
-    python3-coverage erase
+
+    echo
+    echo "Run 'python3-coverage html' to get a nice report"
+    echo "View it by running 'x-www-browser htmlcov'"
+    echo
 fi
 
 echo -e "\e[1;32mEverything passed\e[0m"

=== modified file 'snapcraft/plugins/qml.py'
--- snapcraft/plugins/qml.py	2015-08-05 15:39:18 +0000
+++ snapcraft/plugins/qml.py	2015-08-27 21:34:59 +0000
@@ -76,10 +76,7 @@
     def build_qt_config(self):
         arch = snapcraft.common.get_arch_triplet()
         configdir = os.path.join(self.installdir, 'etc', 'xdg', 'qtchooser')
-        try:
-            os.makedirs(configdir)
-        except FileExistsError:
-            pass
+        os.makedirs(configdir, exist_ok=True)
         config = open(os.path.join(configdir, 'snappy-qt5.conf'), 'w')
         config.write('./usr/lib/{}/qt5/bin\n'.format(arch))
         config.write('./usr/lib/{}\n'.format(arch))