From b4c7520dd8cdc242d10fca56846d4b8515db80bd Mon Sep 17 00:00:00 2001
From: Carson Woods <cwoods289@gmail.com>
Date: Thu, 18 Jul 2019 15:50:19 -0600
Subject: [PATCH] Flake8 Test Compliance

---
 lib/spack/spack/cmd/uninstall.py    |  3 ++-
 lib/spack/spack/modules/common.py   |  3 ++-
 lib/spack/spack/package.py          |  2 +-
 lib/spack/spack/test/cmd/install.py | 40 +++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py
index eed90305f9d..a004c3c0589 100644
--- a/lib/spack/spack/cmd/uninstall.py
+++ b/lib/spack/spack/cmd/uninstall.py
@@ -283,7 +283,8 @@ def do_uninstall(env, specs, force):
                      scope='user')
 
     spack.config.set('config:active_upstream', None,
-                         scope='user')
+                     scope='user')
+
 
 def get_uninstall_list(args, specs, env):
     # Gets the list of installed specs that match the ones give via cli
diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py
index 71ea29c1d36..c1dbf03fd14 100644
--- a/lib/spack/spack/modules/common.py
+++ b/lib/spack/spack/modules/common.py
@@ -225,7 +225,8 @@ def root_path(name):
 
     if active_upstream:
         root_name = 'upstreams:' + active_upstream + ":modules:" + name
-        path = spack.config.get(root_name, os.path.join(spack.paths.share_path, name))
+        path = spack.config.get(root_name, os.path.join(spack.paths.share_path,
+                                                        name))
     else:
         path = roots.get(name, os.path.join(spack.paths.share_path, name))
 
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 1b23f0cf16c..d301c061797 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -1497,7 +1497,7 @@ def do_install(self, **kwargs):
         # Install Package to Global Upstream for multi-user use
         if install_global:
             spack.config.set('config:active_upstream', 'global',
-                         scope='user')
+                             scope='user')
             global_root = spack.config.get('upstreams')
             global_root = global_root['global']['install_tree']
             global_root = spack.util.path.canonicalize_path(global_root)
diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py
index 538b0c06865..c5902e1ea34 100644
--- a/lib/spack/spack/test/cmd/install.py
+++ b/lib/spack/spack/test/cmd/install.py
@@ -60,6 +60,46 @@ def test_install_package_and_dependency(
     assert 'errors="0"' in content
 
 
+def test_global_install_package_and_dependency(
+        tmpdir, mock_packages, mock_archive, mock_fetch, config,
+        install_mockery):
+
+    with tmpdir.as_cwd():
+        install('--global',
+                '--log-format=junit',
+                '--log-file=test.xml',
+                'libdwarf')
+
+    files = tmpdir.listdir()
+    filename = tmpdir.join('test.xml')
+    assert filename in files
+
+    content = filename.open().read()
+    assert 'tests="2"' in content
+    assert 'failures="0"' in content
+    assert 'errors="0"' in content
+
+
+def test_upstream_install_package_and_dependency(
+        tmpdir, mock_packages, mock_archive, mock_fetch, config,
+        install_mockery):
+
+    with tmpdir.as_cwd():
+        install('--upstream global',
+                '--log-format=junit',
+                '--log-file=test.xml',
+                'libdwarf')
+
+    files = tmpdir.listdir()
+    filename = tmpdir.join('test.xml')
+    assert filename in files
+
+    content = filename.open().read()
+    assert 'tests="2"' in content
+    assert 'failures="0"' in content
+    assert 'errors="0"' in content
+
+
 @pytest.mark.disable_clean_stage_check
 def test_install_runtests_notests(monkeypatch, mock_packages, install_mockery):
     def check(pkg):