[master 1/1] Activate coverage for tests executed with sudo

atodorov installerbot-noreply at redhat.com
Mon Sep 7 14:26:34 UTC 2015


From: Alexander Todorov <atodorov at redhat.com>

---
 Makefile.am              |  6 +++++-
 utils/user-site-packages | 12 ------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 utils/user-site-packages

diff --git a/Makefile.am b/Makefile.am
index 66790b4..e92a1e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,8 @@ RC_RELEASE ?= $(shell date -u +0.1.%Y%m%d%H%M%S)
 MOCKCHROOT ?= fedora-rawhide-$(shell uname -m)
 
 COVERAGE ?= coverage3
-USER_SITE_PACKAGES ?= $(shell $(PYTHON) $(srcdir)/utils/user-site-packages)
+USER_SITE_PACKAGES ?= $(shell $(PYTHON) -m site --user-site)
+ROOT_SITE_PACKAGES ?= $(shell sudo $(PYTHON) -m site --user-site)
 
 tag:
 	@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
@@ -167,6 +168,8 @@ runglade:
 ci: rc-release
 	@mkdir -p $(USER_SITE_PACKAGES)
 	@cp $(abs_builddir)/tests/usercustomize.py $(USER_SITE_PACKAGES)
+	@sudo mkdir -p $(ROOT_SITE_PACKAGES)
+	@sudo cp $(abs_builddir)/tests/usercustomize.py $(ROOT_SITE_PACKAGES)
 	$(MAKE) -C utils/dd
 	$(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc check
 	@sudo $(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc \
@@ -176,6 +179,7 @@ ci: rc-release
 	@createrepo -p repo
 	@sudo $(MAKE) TMPDIR=/var/tmp TESTS=install/run_install_test.sh TEST_ANACONDA_REPO=file://$(abs_builddir)/repo/ COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc check
 	@rm -f $(USER_SITE_PACKAGES)/usercustomize.py
+	@sudo rm -f $(ROOT_SITE_PACKAGES)/usercustomize.py
 	$(MAKE) coverage-report
 
 coverage-report:
diff --git a/utils/user-site-packages b/utils/user-site-packages
deleted file mode 100644
index 2c51a8e..0000000
--- a/utils/user-site-packages
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-vi = sys.version_info
-home = "~"
-if 'HOME' in os.environ:
-    home=os.environ['HOME']
-
-path = os.path.join(home, ".local/lib/python%d.%d/site-packages/" % (vi.major, vi.minor))
-print(path)


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/43b1a9397f33f00fb01568880ca0f89186dbc6c6


More information about the anaconda-patches mailing list