Merge branch 'master' into newui-merge

Conflicts:
	Makefile.am
	anaconda
	anaconda.spec.in
	loader/loader.c
	loader/net.c
	loader/unpack.c
	po/POTFILES.in
	pyanaconda/__init__.py
	pyanaconda/bootloader.py
	pyanaconda/cmdline.py
	pyanaconda/constants.py
	pyanaconda/dispatch.py
	pyanaconda/errors.py
	pyanaconda/flags.py
	pyanaconda/iutil.py
	pyanaconda/kickstart.py
	pyanaconda/platform.py
	pyanaconda/storage/__init__.py
	pyanaconda/storage/devicetree.py
	pyanaconda/storage/fcoe.py
	pyanaconda/storage/formats/swap.py
	pyanaconda/storage/iscsi.py
	pyanaconda/storage/partitioning.py
	pyanaconda/yuminstall.py
	scripts/makeupdates

1 files changed, 0 insertions, 17 deletions

diff --git a/tests/pyanaconda_test/vnc_test.py b/tests/pyanaconda_test/vnc_test.py
index 45b79e273..8b703c81c 100644
--- a/tests/pyanaconda_test/vnc_test.py
+++ b/tests/pyanaconda_test/vnc_test.py
@@ -27,29 +27,12 @@ class VncTest(mock.TestCase):
         self.DESKTOP = 'Desktop'
         self.PASS = ''
         self.LOG_FILE = '/tmp/vnc.log'
-        self.PW_INIT_FILE = '/tmp/vncpassword.dat'
         self.PW_FILE = '/tmp/vncpassword'
         self.VNCCONNECTHOST = 'host'
 
     def tearDown(self):
         self.tearDownModules()
 
-    def recover_vnc_password_1_test(self):
-        import pyanaconda.vnc
-        pyanaconda.vnc.open = mock.Mock(side_effect=IOError())
-
-        server = pyanaconda.vnc.VncServer()
-        server.recoverVNCPassword()
-        self.assertEqual(server.password, '')
-
-    def recover_vnc_password_2_test(self):
-        import pyanaconda.vnc
-        self.fs.open(self.PW_INIT_FILE, 'w').write('abcdef')
-
-        server = pyanaconda.vnc.VncServer(pw_init_file=self.PW_INIT_FILE)
-        server.recoverVNCPassword()
-        self.assertEqual(server.password, 'abcdef')
-
     def set_vnc_password_1_test(self):
         import pyanaconda.vnc
         server = pyanaconda.vnc.VncServer()