From 945447e3929f2b3a3241cea6dede70876ba06008 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Thu, 13 Nov 2014 10:32:38 -0800
Subject: [PATCH] if __name__ does work with ansible modules

---
 lib/ansible/modules/packaging/os/apt.py | 3 +--
 lib/ansible/modules/tests/test_apt.py   | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/ansible/modules/packaging/os/apt.py b/lib/ansible/modules/packaging/os/apt.py
index 459aaaa97a9..d732619b94e 100644
--- a/lib/ansible/modules/packaging/os/apt.py
+++ b/lib/ansible/modules/packaging/os/apt.py
@@ -568,6 +568,5 @@ def main():
 # import module snippets
 from ansible.module_utils.basic import *
 
-# FIXME: if __name__ == "__main__": ?
-if "ANSIBLE_IN_HAPPY_UNITTEST_LAND" not in os.environ:
+if __name__ == "__main__":
     main()
diff --git a/lib/ansible/modules/tests/test_apt.py b/lib/ansible/modules/tests/test_apt.py
index 10e3583801f..c5802227759 100644
--- a/lib/ansible/modules/tests/test_apt.py
+++ b/lib/ansible/modules/tests/test_apt.py
@@ -3,8 +3,6 @@ import mock
 import os
 import unittest
 
-# FIXME: this is not super elegant
-os.environ["ANSIBLE_IN_HAPPY_UNITTEST_LAND"] = "1"
 from packaging.apt import (
     expand_pkgspec_from_fnmatches,
 )