Repository: libcloud Updated Branches: refs/heads/trunk a9822d47c -> 6ddd2bd81
Rename "nul.json" file to "nul_.json". Apparently "nul" is a reserved name on Windows. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/6ddd2bd8 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/6ddd2bd8 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/6ddd2bd8 Branch: refs/heads/trunk Commit: 6ddd2bd81c8a79fb5456ba857f265ef16ac11910 Parents: a9822d4 Author: Tomaz Muraus <to...@apache.org> Authored: Wed Dec 23 10:12:23 2015 +0100 Committer: Tomaz Muraus <to...@apache.org> Committed: Wed Dec 23 10:12:23 2015 +0100 ---------------------------------------------------------------------- libcloud/test/dns/fixtures/cloudflare/nul.json | 10 ---------- libcloud/test/dns/fixtures/cloudflare/nul_.json | 10 ++++++++++ libcloud/test/dns/test_cloudflare.py | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/6ddd2bd8/libcloud/test/dns/fixtures/cloudflare/nul.json ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/fixtures/cloudflare/nul.json b/libcloud/test/dns/fixtures/cloudflare/nul.json deleted file mode 100644 index 6762b7c..0000000 --- a/libcloud/test/dns/fixtures/cloudflare/nul.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "response": { - "result": { - "ip": "127.0.0.1", - "action": "NUL" - } - }, - "result": "success", - "msg": null -} http://git-wip-us.apache.org/repos/asf/libcloud/blob/6ddd2bd8/libcloud/test/dns/fixtures/cloudflare/nul_.json ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/fixtures/cloudflare/nul_.json b/libcloud/test/dns/fixtures/cloudflare/nul_.json new file mode 100644 index 0000000..6762b7c --- /dev/null +++ b/libcloud/test/dns/fixtures/cloudflare/nul_.json @@ -0,0 +1,10 @@ +{ + "response": { + "result": { + "ip": "127.0.0.1", + "action": "NUL" + } + }, + "result": "success", + "msg": null +} http://git-wip-us.apache.org/repos/asf/libcloud/blob/6ddd2bd8/libcloud/test/dns/test_cloudflare.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_cloudflare.py b/libcloud/test/dns/test_cloudflare.py index b9f9227..8cf3fe0 100644 --- a/libcloud/test/dns/test_cloudflare.py +++ b/libcloud/test/dns/test_cloudflare.py @@ -337,7 +337,8 @@ class CloudFlareMockHttp(MockHttp): def _api_json_html_nul( self, method, url, body, headers): if method == 'GET': - body = self.fixtures.load('nul.json') + # Note: "nul" is a reserved filename on Window + body = self.fixtures.load('nul_.json') else: raise AssertionError('Unsupported method') return (httplib.OK, body, {}, httplib.responses[httplib.OK])
