From 4a8f55e63043369fba32375fe53f0878e7da8b36 Mon Sep 17 00:00:00 2001
From: Ryan Kraus <rmkraus@gmail.com>
Date: Sat, 30 Jan 2016 14:08:32 -0500
Subject: [PATCH] Revised package util tests

The package util tests were revised to pull the external library
pyhelloworld3 from an internal source rather than external. This speeds
up tests, makes tests more reliable, and removes dependency on internet
connection.
---
 tests/resources/pyhelloworld3.zip | Bin 0 -> 2100 bytes
 tests/util/test_package.py        |  53 ++++++++++++++++--------------
 2 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 tests/resources/pyhelloworld3.zip

diff --git a/tests/resources/pyhelloworld3.zip b/tests/resources/pyhelloworld3.zip
new file mode 100644
index 0000000000000000000000000000000000000000..f2a419e9f340dd870e1c729d06cbc9d622ef0e0f
GIT binary patch
literal 2100
zcmWIWW@h1H0D&)3b{=2`ln`a$WGJZ2NX^N~FV8Q^Nio*VO)M@+Ez%DSVP#;nox3J1
z07Y-^l&d{@K)oO=k4vv!dS*#xdR~4}D%_N$(#)I`E@YeZQq$9QGxO5&xwP~ODwDb5
z<AG#iaz<)=JQvJP4zPPUXWsa@1ZW=@BLjmRE<1x<9bJ4~^>S0-R`&L7<U3@*<MO?x
zRaGqF)<S7%Zeu1x#kLDOd^3gIJA<$6KhDajxY3}p;`_PnO%~B5eR5OgWKOZFd@GaI
zw&Hf+cMglhRa30e-*h$i32k_w_+<h2<m)}pCV#a$@loPOu18><ruWG+Wg9P~itK8#
zT^bm3P)=`}<+I$_@65N0R!4pMYRhZ5`&ae-(!cR}i?5uM(6m1h%yq#*&oJl_SKo_F
zp--D%aKb!_88OPZJc=BK#+cCr39_`>FK63<LADDVRXCy;)uj0N%)HE!_;_Gsz=P1W
z&yee|0gr3>T&IeYX+c)sMV4+h?48qcYTCxBZFlzdalcimxb*wiF^Ln$oz86Xe)y8B
zpnu-XRY~8@PoK~E()TEnjaF-~p@(DcYtyqY%%{GXy6k@LmzBL9p8MUnSH)U7^Tqmg
z@0i4T*{->m_j>50;)=r$liaQO7#4cC{LXL9J`*HjT_}5y9TrLuzkTxjvM&wjuL>YG
zATE>;=^NR1!C@D!UJCU%=YR5y_x7L<Jm0Qw-C(fwiYW_cv8JYGYf6fk_LFDJr#xGt
zwIoGM{E14KnD&b5CC{Eb(Vp^L{OJ-6jaAH33kwUEE?K6T(s1PQ!ADZF!eY1_0s^MY
z3}3`}RgmxM!jr5FsE#*Ow>*3ln2skhGcd^Fa(r=WNofJHOKT_jX5TRoXnX%pG)X^i
zVJH9F%!3znIZIw{<1F>!Q=Ac5ozwk-yEf;;{`VeX!ModEC7FCaWBtCzG(vZ#vwY9>
zD2roDFJ9B1s1$$3W}(2Z(CCZxI$cw$!wsysRIWW$i?8#T$sKik>nih|ueY83xGi==
zf@`ebJ?ZW1S55q_IcL4KuC{i(4oi6Msnu(AE80&5K5lNzbGr88;Ql7pvM3?R<_GGz
zuRlHK>8kB6n(fjpWKp_&_Ow0R?><W~Z>)V*RWkSKvE!Df)?Z}zcKdhZLRQZ8GwUWQ
zuvp!aDA6}ia+WHe{@|{DyR$&fg=v*eJES6C@yPu)k84`g@A9<VyMIo>*UR?Nb#b3!
zN|nCcNL%;zp!44Z=4VBW^Q^qwlUG^(e#c^QoZYW}QJvSsic{6A-MNF@($xc!JKDZg
zm)T$57P8Lw32(3JmQJ(C#|PQPcly8Ss&(Yg{=}}T+tGV(trTndWvShv;(1%Wnp|ui
z&0Oo0{b_~Gs(EH*9JcOPRgb=De-^p;r=iP(b(Wi&4a4GBOnUdf-hAb+z9$NQm!_4;
zJykl~cjb-?dvrAatq*!i`IBDD2L3s6UQEaRd->uwyWcVIoi_Dc@yC5Xcmuo{nSg~D
zFx6t_c2F@40Rm7OC39jalu^w>FP1@u08<$d*Z?tBv#=D>2p3{6ctPetOx=LXRLo)+
zVJN1zL4_OyfV@2uXf{@-q6i`vd9XmhUg&{LhB)^zaVBFc0uj!~Uiu&`*$<3e6qmwc
z4Mk8Nds&2T4SG3&u%-rBa-f(9vj(Ho2=HcQ1L<Q2!a|_qT3HzwG#E^i5-rRvj1A3F
i%q&t94b4najgr$$lTr*UOj8V!(+ty6%*~Qg3{3%NPvlMj

literal 0
HcmV?d00001

diff --git a/tests/util/test_package.py b/tests/util/test_package.py
index 1ffd66e1bb4..7c10134c60a 100644
--- a/tests/util/test_package.py
+++ b/tests/util/test_package.py
@@ -1,16 +1,20 @@
 """
 Tests Home Assistant package util methods.
 """
-import unittest
-import sys
+import os
 import tempfile
+import unittest
+
+import homeassistant.bootstrap as bootstrap
 import homeassistant.util.package as package
 
+RESOURCE_DIR = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', 'resources'))
+
 TEST_EXIST_REQ = "pip>=7.0.0"
 TEST_NEW_REQ = "pyhelloworld3==1.0.0"
-TEST_ZIP_REQ = \
-    "https://github.com/rmkraus/pyhelloworld3/archive/" \
-    "5ba878316d68ea164e2cf5bd085d0cf1fd76bd15.zip#pyhelloworld3==1.0.0"
+TEST_ZIP_REQ = 'file://{}#{}' \
+    .format(os.path.join(RESOURCE_DIR, 'pyhelloworld3.zip'), TEST_NEW_REQ)
 
 
 class TestPackageUtil(unittest.TestCase):
@@ -18,41 +22,40 @@ class TestPackageUtil(unittest.TestCase):
 
     def setUp(self):
         """ Create local library for testing """
-        self.lib_dir = tempfile.TemporaryDirectory()
+        self.tmp_dir = tempfile.TemporaryDirectory()
+        self.lib_dir = os.path.join(self.tmp_dir.name, 'lib')
 
     def tearDown(self):
         """ Remove local library """
-        del self.lib_dir
+        del self.tmp_dir
 
     def test_install_existing_package(self):
         """ Test an install attempt on an existing package """
         self.assertTrue(package.check_package_exists(
-            TEST_EXIST_REQ, self.lib_dir.name))
+            TEST_EXIST_REQ, self.lib_dir))
 
         self.assertTrue(package.install_package(TEST_EXIST_REQ))
 
-    def test_install_package_locally(self):
-        """ Test an install attempt to the local library """
-        self.assertFalse(package.check_package_exists(
-            TEST_NEW_REQ, self.lib_dir.name))
-
-        self.assertTrue(package.install_package(
-            TEST_NEW_REQ, True, self.lib_dir.name))
-
-        sys.path.insert(0, self.lib_dir.name)
-        import pyhelloworld3
-
-        self.assertEqual(pyhelloworld3.__version__, '1.0.0')
-
     def test_install_package_zip(self):
         """ Test an install attempt from a zip path """
         self.assertFalse(package.check_package_exists(
-            TEST_ZIP_REQ, self.lib_dir.name))
+            TEST_ZIP_REQ, self.lib_dir))
+        self.assertFalse(package.check_package_exists(
+            TEST_NEW_REQ, self.lib_dir))
 
         self.assertTrue(package.install_package(
-            TEST_ZIP_REQ, True, self.lib_dir.name))
+            TEST_ZIP_REQ, True, self.lib_dir))
 
-        sys.path.insert(0, self.lib_dir.name)
-        import pyhelloworld3
+        self.assertTrue(package.check_package_exists(
+            TEST_ZIP_REQ, self.lib_dir))
+        self.assertTrue(package.check_package_exists(
+            TEST_NEW_REQ, self.lib_dir))
+
+        bootstrap.mount_local_lib_path(self.tmp_dir.name)
+
+        try:
+            import pyhelloworld3
+        except ImportError:
+            self.fail('Unable to import pyhelloworld3 after installing it.')
 
         self.assertEqual(pyhelloworld3.__version__, '1.0.0')