Merge "Remove double_tuple"

devops/models/base.py

@@ -22,17 +22,10 @@ from django.utils.importlib import import_module
 def choices(*args, **kwargs):
     defaults = {'max_length': 255, 'null': False}
     defaults.update(kwargs)
-    defaults.update(choices=double_tuple(*args))
+    defaults.update(choices=zip(args, args))
     return models.CharField(**defaults)
 
 
-def double_tuple(*args):
-    dict = []
-    for arg in args:
-        dict.append((arg, arg))
-    return tuple(dict)
-
-
 class DriverModel(models.Model):
     _driver = None
     created = models.DateTimeField(auto_now_add=True, default=datetime.utcnow)

devops/tests/test_models.py

@@ -1,31 +0,0 @@
-#    Copyright 2013 - 2014 Mirantis, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import random
-import threading
-
-from django.utils import unittest
-
-from devops.models.base import double_tuple
-from devops.models import Network
-
-
-class MyThread(threading.Thread):
-    def run(self):
-        Network.network_create(str(random.randint(1, 5000)))
-
-
-class TestModels(unittest.TestCase):
-    def test_django_choices(self):
-        self.assertEquals((('a', 'a'), ('b', 'b')), double_tuple('a', 'b'))