Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name = "ObjectStore"
name = "RustyObjectStore"
uuid = "1b5eed3d-1f46-4baa-87f3-a4a892b23610"
version = "0.1.0"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# ObjectStore.jl2
# RustyObjectStore.jl
2 changes: 1 addition & 1 deletion src/ObjectStore.jl → src/RustyObjectStore.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module ObjectStore
module RustyObjectStore

export init_object_store, blob_get!, blob_put, AzureCredentials, ObjectStoreConfig

Expand Down
7 changes: 3 additions & 4 deletions test/azure_blobs_exception_tests.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@testitem "Basic BlobStorage exceptions" setup=[InitializeObjectStore] begin
using CloudBase.CloudTest: Azurite
import CloudBase
using ObjectStore: blob_get!, blob_put, AzureCredentials
import ObjectStore
using RustyObjectStore: RustyObjectStore, blob_get!, blob_put, AzureCredentials

# For interactive testing, use Azurite.run() instead of Azurite.with()
# conf, p = Azurite.run(; debug=true, public=false); atexit(() -> kill(p))
Expand Down Expand Up @@ -147,7 +146,7 @@

@testset "multiple start" begin
config = ObjectStoreConfig(5, 5)
res = @ccall ObjectStore.rust_lib.start(config::ObjectStoreConfig)::Cint
res = @ccall RustyObjectStore.rust_lib.start(config::ObjectStoreConfig)::Cint
@test res == 1 # Rust CResult::Error
end
end # @testitem
Expand All @@ -164,7 +163,7 @@ end # @testitem
@testitem "BlobStorage retries" setup=[InitializeObjectStore] begin
using CloudBase.CloudTest: Azurite
import CloudBase
using ObjectStore: blob_get!, blob_put, AzureCredentials
using RustyObjectStore: blob_get!, blob_put, AzureCredentials
import HTTP
import Sockets

Expand Down
4 changes: 2 additions & 2 deletions test/azure_blobs_tests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@testitem "Basic BlobStorage usage" setup=[InitializeObjectStore] begin
using CloudBase.CloudTest: Azurite
using ObjectStore: blob_get!, blob_put, AzureCredentials
using RustyObjectStore: blob_get!, blob_put, AzureCredentials

# For interactive testing, use Azurite.run() instead of Azurite.with()
# conf, p = Azurite.run(; debug=true, public=false); atexit(() -> kill(p))
Expand Down Expand Up @@ -105,7 +105,7 @@ end # @testitem
# TODO: implement a way for GET to be called without credentials
@test_skip begin
using CloudBase.CloudTest: Azurite
using ObjectStore: blob_get!, blob_put, AzureCredentials
using RustyObjectStore: blob_get!, blob_put, AzureCredentials

# For interactive testing, use Azurite.run() instead of Azurite.with()
# conf, p = Azurite.run(; debug=true, public=true); atexit(() -> kill(p))
Expand Down
2 changes: 1 addition & 1 deletion test/common_testsetup.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@testsetup module InitializeObjectStore
using ObjectStore
using RustyObjectStore
# Since we currently only support centralized configs, we need to have one that is compatible
# with all the tests (some of the tests would take too long if we use default values).
max_retries = 2
Expand Down
2 changes: 1 addition & 1 deletion test/release_test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# for development reasons, but it should never be set in CI.
@testitem "Using object_store_ffi_jll" begin
using object_store_ffi_jll
@test ObjectStore.rust_lib == object_store_ffi_jll.libobject_store_ffi
@test RustyObjectStore.rust_lib == object_store_ffi_jll.libobject_store_ffi
end
4 changes: 2 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ReTestItems
using ObjectStore
using RustyObjectStore

withenv("RUST_BACKTRACE"=>1) do
runtests(ObjectStore, testitem_timeout=180, nworkers=1)
runtests(RustyObjectStore; testitem_timeout=180, nworkers=1)
end