Skip to content

Commit 2a0cb8f

Browse files
authored
Merge pull request #163 from JuliaRobotics/feature/IIFTests_NoDep
Trying IIFTest without direct dependency
2 parents 5f5061a + 61a1720 commit 2a0cb8f

File tree

4 files changed

+48
-35
lines changed

4 files changed

+48
-35
lines changed

.travis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
language: julia
2+
sudo: required
3+
dist: trusty
24

35
os:
46
- linux
@@ -20,18 +22,9 @@ matrix:
2022
allow_failures:
2123
- julia: nightly
2224

23-
# script:
24-
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
25-
# - julia --project --check-bounds=yes -e 'using UUIDs; write("Project.toml", replace(read("Project.toml", String), r"uuid = .*?\n" =>"uuid = \"$(uuid4())\"\n"));
26-
# import Pkg; Pkg.build("DistributedFactorGraphs"); Pkg.test("DistributedFactorGraphs"; coverage=true)'
27-
28-
# script:
29-
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
30-
# - julia --check-bounds=yes -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("DistributedFactorGraphs"); Pkg.test("DistributedFactorGraphs"; coverage=true)'
31-
32-
# can be used if master of package is required
33-
# script:
34-
# - julia --project --color=yes --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="MetaGraphs", rev="master")); Pkg.build(); Pkg.test(coverage=true)'
25+
before_script:
26+
- sleep 10
27+
- curl -v POST http://neo4j:neo4j@localhost:7474/user/neo4j/password -d"password=test"
3528

3629
after_success:
3730
- julia -e 'using Pkg; cd(Pkg.dir("DistributedFactorGraphs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
@@ -47,3 +40,10 @@ jobs:
4740
Pkg.instantiate()'
4841
- julia --project=docs/ docs/make.jl
4942
after_success: skip
43+
44+
- stage: "IIF Driver Tests"
45+
julia: 1.2
46+
os: linux
47+
script:
48+
- julia -e 'import Pkg; Pkg.add("IncrementalInference"); Pkg.test("DistributedFactorGraphs")'
49+
after_success: skip

Project.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ MetaGraphs = "≥ 0.6.4"
2525
Reexport = "≥ 0.2"
2626
Requires = "≥ 0.5"
2727
julia = "0.7, 1"
28-
IncrementalInference = "0.7.7"
2928

3029
[extras]
3130
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3231
GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
3332
Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
34-
IncrementalInference = "904591bb-b899-562f-9e6f-b8df64c7d480"
33+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
3534

3635
[targets]
37-
test = ["Test", "GraphPlot", "Neo4j", "IncrementalInference"]
36+
test = ["Test", "GraphPlot", "Neo4j", "Pkg"]

test/obsolete_nowinRoME/cloudGraphsDFGTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Requires local Neo4j with user/pass neo4j:test
44
# To run the Docker image
55
# Install: docker pull neo4j
6-
# Run: sudo docker run --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/test neo4j
6+
# Run: sudo docker run --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/neo4j neo4j
77

88
using Revise
99
using Neo4j

test/runtests.jl

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using Test
22
using GraphPlot # For plotting tests
33
using Neo4j
44
using DistributedFactorGraphs
5-
using IncrementalInference
5+
using Pkg
66

77
# Instantiate the APIs that you would like to test here
88
# Can do duplicates with different parameters.
@@ -27,25 +27,39 @@ for api in apis
2727
end
2828
end
2929

30-
apis = [
31-
GraphsDFG{NoSolverParams}(),
32-
LightDFG{NoSolverParams}(),
33-
# MetaGraphsDFG{NoSolverParams}(),
34-
# SymbolDFG{NoSolverParams}(),
35-
# CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
36-
# "testUser", "testRobot", "testSession",
37-
# nothing,
38-
# nothing,
39-
# IncrementalInference.decodePackedType,
40-
# IncrementalInference.rebuildFactorMetadata!,
41-
# solverParams=SolverParams())
42-
]
43-
for api in apis
44-
@testset "Testing Driver: $(typeof(api))" begin
45-
@info "Testing Driver: $(api)"
46-
global dfg = deepcopy(api)
47-
include("iifInterfaceTests.jl")
30+
if haskey(Pkg.installed(), "IncrementalInference")
31+
@info "------------------------------------------------------------------------"
32+
@info "These tests are using IncrementalInference to do additional driver tests"
33+
@info "------------------------------------------------------------------------"
34+
35+
using IncrementalInference
36+
37+
@info "------------------------------------------------------------------------"
38+
@info "Neo4J Travis Test"
39+
@info "------------------------------------------------------------------------"
40+
41+
apis = [
42+
GraphsDFG{NoSolverParams}(),
43+
LightDFG{NoSolverParams}(),
44+
# MetaGraphsDFG{NoSolverParams}(),
45+
# SymbolDFG{NoSolverParams}(),
46+
# CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
47+
# "testUser", "testRobot", "testSession",
48+
# nothing,
49+
# nothing,
50+
# IncrementalInference.decodePackedType,
51+
# IncrementalInference.rebuildFactorMetadata!,
52+
# solverParams=SolverParams())
53+
]
54+
for api in apis
55+
@testset "Testing Driver: $(typeof(api))" begin
56+
@info "Testing Driver: $(api)"
57+
global dfg = deepcopy(api)
58+
include("iifInterfaceTests.jl")
59+
end
4860
end
61+
else
62+
@warn "Skipping IncrementalInference driver tests"
4963
end
5064

5165
# Test that we don't export LightDFG and MetaGraphsDFG

0 commit comments

Comments
 (0)