Skip to content

Commit

Permalink
Typo fix, it's ANACONDA_WIDGETS_DATA not ANACONDA_WIDGETS_DATADIR
Browse files Browse the repository at this point in the history
  • Loading branch information
atodorov committed Nov 4, 2015
1 parent e87f9bc commit b7665f0
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py
Expand Up @@ -60,7 +60,7 @@ def __init__(self):

def initialize(self):
# Render an arrow for the chosen language
datadir = os.environ.get("ANACONDA_WIDGETS_DATADIR", "/usr/share/anaconda")
datadir = os.environ.get("ANACONDA_WIDGETS_DATA", "/usr/share/anaconda")
self._right_arrow = Gtk.Image.new_from_file(os.path.join(datadir, "pixmaps", "right-arrow-icon.png"))
self._left_arrow = Gtk.Image.new_from_file(os.path.join(datadir, "pixmaps", "left-arrow-icon.png"))
override_cell_property(self._langSelectedColumn, self._langSelectedRenderer,
Expand Down
51 changes: 51 additions & 0 deletions tests/pyanaconda_tests/lang_locale_handler_test.py
@@ -0,0 +1,51 @@
#
# Copyright (C) 2015 Red Hat, Inc.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions of
# the GNU General Public License v.2, or (at your option) any later version.
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY expressed or implied, including the implied warranties of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details. You should have received a copy of the
# GNU General Public License along with this program; if not, write to the
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the
# source code or documentation are not subject to the GNU General Public
# License and may only be used or replicated with the express permission of
# Red Hat, Inc.
#
# Red Hat Author(s): Alexander Todorov <atodorov@redhat.com>
#

from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler

This comment has been minimized.

Copy link
@vpodzime

vpodzime Nov 5, 2015

I take it that this requires the other patches to work even when the anaconda RPMs are not installed, right? It should probably be the last patch in the set then.

This comment has been minimized.

Copy link
@atodorov

atodorov Nov 5, 2015

Author Owner

Hmm, I'm not sure. The other patches have to do with loading widgets and stuff and in the test we mock pretty much everything. I will try and test this stand alone and see how it goes though.

This comment has been minimized.

Copy link
@atodorov

atodorov Nov 6, 2015

Author Owner

@vpodzime - I've testing only this commit alone, without the others and the test executes just fine.

This comment has been minimized.

Copy link
@vpodzime

vpodzime Nov 6, 2015

Thanks for double-checking this!

import unittest
import mock
import os

@unittest.skipUnless(os.environ.get("DISPLAY"), "DISPLAY is not defined")
class LLH(unittest.TestCase):
def setUp(self):
self.llh = LangLocaleHandler()
self.llh._languageStoreFilter = mock.Mock()
self.llh._langSelectedRenderer = mock.Mock()
self.llh._langSelectedColumn = mock.Mock()
self.llh._add_language = mock.Mock()

self.orig_anaconda_widgets_data = os.environ.get("ANACONDA_WIDGETS_DATA", "")
if not "ANACONDA_WIDGETS_DATA" in os.environ:
widgets_data = os.path.dirname(os.path.abspath(__file__))
widgets_data = os.path.dirname(os.path.dirname(widgets_data))
widgets_data = os.path.join(widgets_data, "widgets", "data")
# pylint: disable=environment-modify
os.environ["ANACONDA_WIDGETS_DATA"] = widgets_data

def tearDown(self):
# pylint: disable=environment-modify
os.environ["ANACONDA_WIDGETS_DATA"] = self.orig_anaconda_widgets_data

def anaconda_widgets_data_test(self):
"""Test if ANACONDA_WIDGETS_DATA is used if specified."""
self.llh.initialize()
self.assertEqual(self.llh._right_arrow.get_property('file').find("/usr/share/anaconda"), -1)
self.assertEqual(self.llh._left_arrow.get_property('file').find("/usr/share/anaconda"), -1)

0 comments on commit b7665f0

Please sign in to comment.