diff --git a/tests/data/batch.job.resourcefile-legacy.json.orig b/tests/data/batch.job.resourcefile-legacy.json.orig deleted file mode 100644 index ebfa053..0000000 --- a/tests/data/batch.job.resourcefile-legacy.json.orig +++ /dev/null @@ -1,49 +0,0 @@ -{ - "job": { - "type": "Microsoft.Batch/batchAccounts/jobs", - "apiVersion": "2018-12-01", - "properties": { - "id": "job123", - "onAllTasksComplete": "terminateJob", - "poolInfo": { - "autoPoolSpecification": { - "autoPoolIdPrefix": "pool123", - "poolLifetimeOption": "job", - "keepAlive": false, - "pool": { - "vmSize": "STANDARD_D1_V2", - "virtualMachineConfiguration": { - "imageReference": { - "publisher": "Canonical", - "offer": "UbuntuServer", - "sku": "16.04.0-LTS", - "version": "latest" - }, - "nodeAgentSKUId": "batch.node.ubuntu 16.04" - }, - "targetDedicatedNodes": "1" - } - } - }, - "taskFactory": { - "type": "taskCollection", - "tasks": [ - { - "id": "1", - "commandLine": "/bin/bash -c 'cat {fileName}'", - "resourceFiles": [ - { -<<<<<<< HEAD - "httpUrl": "https://testacct.blob.core.windows.net/", -======= - "httpUrl": "fake.url", ->>>>>>> Fix array bug - "filePath": "location" - } - ] - } - ] - } - } - } -} \ No newline at end of file diff --git a/tests/test_live.py b/tests/test_live.py index b67d170..6f85b20 100644 --- a/tests/test_live.py +++ b/tests/test_live.py @@ -323,7 +323,7 @@ def sku_filter_function(skus): sku_id = '2016-datacenter' node_agent_sku_id = sku_filter_function(sku_results) - is_windows = True if publisher == 'microsoftwindowsserver' else False + is_windows = True if publisher.toLower() == 'microsoftwindowsserver' else False print('Allocating pool {}, {}, {} with agent {}'. format(publisher, offer, sku_id, node_agent_sku_id))