diff options
| author | Peter Melnichenko <mpeterval@gmail.com> | 2017-09-11 13:14:02 +0300 |
|---|---|---|
| committer | Peter Melnichenko <mpeterval@gmail.com> | 2017-09-11 13:14:02 +0300 |
| commit | 957149e4be48fe3f87b44f73984c5b20fd8d08f1 (patch) | |
| tree | 5a4d5f4acbe8f0ad6feb8ce7fc963b2f6a2bc029 /spec | |
| parent | 714d887f99dad19d406de36e6d9d88739066f4f1 (diff) | |
| download | luarocks-957149e4be48fe3f87b44f73984c5b20fd8d08f1.tar.gz luarocks-957149e4be48fe3f87b44f73984c5b20fd8d08f1.tar.bz2 luarocks-957149e4be48fe3f87b44f73984c5b20fd8d08f1.zip | |
Use dkjson instead of lua-cjson for upload test
lua-cjson fails to build under LuaJIT 2.1.0-beta3.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/upload_spec.lua | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua index cd175730..8b3e0433 100644 --- a/spec/upload_spec.lua +++ b/spec/upload_spec.lua | |||
| @@ -5,8 +5,6 @@ local testing_paths = test_env.testing_paths | |||
| 5 | test_env.unload_luarocks() | 5 | test_env.unload_luarocks() |
| 6 | 6 | ||
| 7 | local extra_rocks = { | 7 | local extra_rocks = { |
| 8 | "/lua-cjson-2.1.0-1.src.rock", | ||
| 9 | |||
| 10 | -- rocks needed for mock-server | 8 | -- rocks needed for mock-server |
| 11 | "/copas-2.0.1-1.src.rock", | 9 | "/copas-2.0.1-1.src.rock", |
| 12 | "/coxpcall-1.16.0-1.src.rock", | 10 | "/coxpcall-1.16.0-1.src.rock", |
| @@ -46,9 +44,8 @@ describe("LuaRocks upload tests #blackbox #b_upload", function() | |||
| 46 | end) | 44 | end) |
| 47 | 45 | ||
| 48 | it("LuaRocks upload force #unix", function() | 46 | it("LuaRocks upload force #unix", function() |
| 49 | assert.is_true(run.luarocks_bool("install lua-cjson")) | 47 | assert.is_true(test_env.need_rock("dkjson")) |
| 50 | assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec")) | 48 | assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec")) |
| 51 | assert.is_true(run.luarocks_bool("install lua-cjson")) | ||
| 52 | end) | 49 | end) |
| 53 | 50 | ||
| 54 | describe("LuaRocks upload tests with Xavante server #mock", function() | 51 | describe("LuaRocks upload tests with Xavante server #mock", function() |