Fixed conflicting import

howard-d3 · Nov 10, 2017 · 9bc7c68 · 9bc7c68
1 parent feec58b
commit 9bc7c68
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/azure-batch/tests/preparers.py → azure-batch/tests/batch_preparers.py b/azure-batch/tests/preparers.py → azure-batch/tests/batch_preparers.py
diff --git a/azure-batch/tests/test_batch.py b/azure-batch/tests/test_batch.py
@@ -15,7 +15,7 @@
 
 import azure.batch
 from azure.batch import models
-from preparers import (
+from batch_preparers import (
     AccountPreparer,
     PoolPreparer,
     JobPreparer

diff --git a/azure-mgmt-batch/tests/preparers.py → ...-mgmt-batch/tests/mgmt_batch_preparers.py b/azure-mgmt-batch/tests/preparers.py → ...-mgmt-batch/tests/mgmt_batch_preparers.py
diff --git a/azure-mgmt-batch/tests/test_mgmt_batch.py b/azure-mgmt-batch/tests/test_mgmt_batch.py
@@ -14,7 +14,7 @@
 import azure.mgmt.batch
 from azure.mgmt.batch import models
 from azure.common.exceptions import CloudError
-from preparers import KeyVaultPreparer, SimpleBatchPreparer
+from mgmt_batch_preparers import KeyVaultPreparer, SimpleBatchPreparer
 
 from devtools_testutils import (
     AzureMgmtTestCase,