Skip to content

Commit

Permalink
tests run on 0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
louisponet committed May 25, 2018
1 parent f8a04b0 commit 939b232
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 12 deletions.
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ RecipesBase
GeometryTypes
Parameters
Conda
Nullables
Empty file modified assets/inputs/qe/job.tt
100755 → 100644
Empty file.
Empty file modified assets/outputs/bands.out
100755 → 100644
Empty file.
31 changes: 31 additions & 0 deletions deps/build.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (60) SSL certificate problem: unable to get local issuer certificate
More details here: https://curl.haxx.se/docs/sslcerts.html

curl performs SSL certificate verification by default, using a "bundle"
of Certificate Authority (CA) public keys (CA certs). If the default
bundle file isn't adequate, you can specify an alternate file
using the --cacert option.
If this HTTPS server uses a certificate signed by a CA represented in
the bundle, the certificate verification probably failed due to a
problem with the certificate (it might be expired, or the name might
not match the domain name in the URL).
If you'd like to turn off curl's verification of the certificate, use
the -k (or --insecure) option.
ERROR: LoadError: failed process: Process(`curl -g -L -f -o /Users/ponet/.julia/dev/DFControl/deps/cif2cell.tar.gz https://sourceforge.net/projects/cif2cell/files/latest/download`, ProcessExited(60)) [60]
Stacktrace:
[1] error(::String, ::Base.Process, ::String, ::Int64, ::String) at ./error.jl:42
[2] pipeline_error at ./process.jl:712 [inlined]
[3] #run#539(::Bool, ::Function, ::Cmd) at ./process.jl:670
[4] run at ./process.jl:668 [inlined]
[5] download(::String, ::String) at ./download.jl:45
[6] top-level scope
[7] include at ./boot.jl:314 [inlined]
[8] include_relative(::Module, ::String) at ./loading.jl:1067
[9] include(::Module, ::String) at ./sysimg.jl:29
[10] include(::String) at ./sysimg.jl:68
[11] top-level scope
[12] eval(::Module, ::Any) at ./boot.jl:317
in expression starting at /Users/ponet/.julia/dev/DFControl/deps/build.jl:18
Expand Down
4 changes: 1 addition & 3 deletions src/DFControl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ __precompile__()
module DFControl
# using Reexport
import Base.Iterators.flatten
using RecipesBase
using GeometryTypes
using Parameters
using RecipesBase, GeometryTypes, Parameters, Nullables

abstract type Package end
struct Wannier90 <: Package end
Expand Down
2 changes: 1 addition & 1 deletion src/abinit/fileio.jl
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function extract_structures!(abi_datasets...; structure_name = "NoName")
rprim[3,1] = -0.5 * aa
rprim[3,2] = -sqrt(3.0) * 0.5 * aa
rprim[3,3] = cc
else:
else
# Treat all the other cases
rprim[1,1] = 1.0
rprim[2,1] = cos(pi * angdeg[3] / 180.)
Expand Down
4 changes: 2 additions & 2 deletions src/server_comm.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ function pull_file(server_dir::String, local_dir::String, filename::String; serv
end
end

function pull_files(server_dir::String, local_dir::String, filenames::Vector{String}; server=getdefault_server())
function pull_files(server_dir::String, local_dir::String, filenames::Vector{String}; serv=getdefault_server())
pulled_files = String[]
for file in filenames
push!(pulled_files, pull_file(server_dir, local_dir, file; server))
push!(pulled_files, pull_file(server_dir, local_dir, file, serv))
end
return pulled_files
end
Expand Down
2 changes: 2 additions & 0 deletions src/utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ function fort2julia(f_type)
return Bool
elseif contains(f_type,".D")
return replace(f_type, "D", "e")
else
return Void
end
end

Expand Down
3 changes: 2 additions & 1 deletion test/defaults_test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ using DFControl

prevdefault = getdefault_server()
setdefault_server("localhost")
setdefault_pseudodir(:test, joinpath(Pkg.dir("DFControl"), "test/testassets/pseudos"))
setdefault_pseudodir(:test, joinpath(@__DIR__, "testassets/pseudos"))
# setdefault_pseudodir(:test, joinpath(Pkg.dir("DFControl"), "test/testassets/pseudos"))
configure_defaultpseudos(pseudo_dirs=Dict(:test => getdefault_pseudodirs()[:test]))

@add_default testdefaultstring = "test"
Expand Down
3 changes: 2 additions & 1 deletion test/job_control_tests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using DFControl, Base.Test

testjobpath = joinpath(Pkg.dir("DFControl"), "test/testassets/test_job/")
# testjobpath = joinpath(Pkg.dir("DFControl"), "test/testassets/test_job/")
testjobpath = joinpath(@__DIR__, "testassets/test_job/")
job = DFJob(testjobpath);

nscf = DFControl.input(job, "nscf")
Expand Down
3 changes: 2 additions & 1 deletion test/jobfromcif_test.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using DFControl, Base.Test

testjobpath = joinpath(Pkg.dir("DFControl"),"test/testassets/test_job/")
# testjobpath = joinpath(Pkg.dir("DFControl"),"test/testassets/test_job/")
testjobpath = joinpath(@__DIR__,"testassets/test_job/")

name = "Pt"
local_dir = testjobpath
Expand Down
2 changes: 1 addition & 1 deletion test/plotting_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using DFControl, Base.Test
using Plots
# @test plot_qe_bands(joinpath(@__DIR__,"../assets/outputs/bands.out")) != nothing
# @test plot_qe_kpdos(joinpath(@__DIR__,"../assets/outputs/kpdos.out")) != nothing
test_bands = read_qe_bands_file(joinpath(@__DIR__,"../assets/outputs/bands.out"))
test_bands = read_qe_bands_file(joinpath(@__DIR__, "../assets/outputs/bands.out"))
@test plot(test_bands[1], fermi=3) != nothing
@test plot(test_bands[3],:relative_cart) != nothing
@test plot(test_bands[4],:relative_cryst) != nothing
Expand Down
2 changes: 0 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ using DFControl
using Base.Test
import DFControl: Exec, data, add!, execs



tic()
@testset "New defaults" begin include("defaults_test.jl") end
@testset "Job from CIF file" begin include("jobfromcif_test.jl") end
Expand Down

0 comments on commit 939b232

Please sign in to comment.